Tobias Diekershoff
ca105f1c66
quattro: cleanup the less file
2012-06-04 07:17:23 +02:00
Simon L'nu
34f210bc2d
fix mini photo-menu bug
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-03 18:10:04 -04:00
Zach Prezkuta
77962aa79d
Fix bugs in the retraction code
...
Currently, the following seems to be the functional status:
For a Diaspora top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete for top-level owner
Diaspora comments show up for non-owner
Diaspora comments sometimes don't delete for non-owner
-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log
Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
Diaspora likes show up
Diaspora non-owner can't unlike
-> Same as comments, seems to be Diaspora's fault
For a Friendica top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete
Friendica likes don't show up in Diaspora sometimes
Friendica doesn't even message Diaspora for unlikes (sometimes?)
Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a
Implement relaying of relayable_retractions
...
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Tobias Diekershoff
959b264c44
quattro: admin panel styling and 1st buttons for addon/theme overview
2012-06-03 22:32:42 +02:00
Tobias Diekershoff
2741ce67f8
privacy settings: make submit button translateable
2012-06-03 17:38:05 +02:00
Tobias Diekershoff
283524d990
DE: update to the strings
2012-06-03 17:33:28 +02:00
Tobias Diekershoff
6fbeafc843
prv messages: make submit translateable
2012-06-03 17:16:29 +02:00
friendica
d27c6de84e
add hometown to profiles
2012-06-02 20:58:20 -07:00
friendica
608d424b0b
"howlong" added to marital status.
2012-06-02 02:30:26 -07:00
friendica
1180919c89
some zero theming on settings page
2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd
transition to beta for private forums
2012-05-30 15:52:17 -07:00
friendica
88a0d6a1d5
private group tests, cont.
2012-05-29 22:57:15 -07:00
friendica
b6fe837a64
hide private group if desired
2012-05-29 18:43:56 -07:00
Simon
43c185ce04
Merge pull request #316 from annando/master
...
Speed improvements
2012-05-29 13:13:10 -07:00
Simon L'nu
dd666e93d8
fix toolbar. more size dynamicism
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-29 16:09:02 -04:00
Michael Vogel
68757f2504
Merge remote branch 'upstream/master'
2012-05-29 16:09:26 +02:00
friendica
2eafa9a475
ability to only expire contacts, not self
2012-05-29 01:14:53 -07:00
friendica
2dc7e53435
more theme cleanup
2012-05-28 19:17:06 -07:00
Simon L'nu
cb259098dd
fixed font-size/line-height stuffs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-28 19:25:10 -04:00
friendica
6962989e52
slackr - tone down the shadows a smidgin
2012-05-27 23:02:25 -07:00
Michael Vogel
a71e3134bf
Merge remote branch 'upstream/master'
2012-05-25 16:19:10 +02:00
friendica
d1345e5054
Merge https://github.com/friendica/friendica into pull
2012-05-25 00:43:09 -07:00
friendica
abb9fecf09
rev update
2012-05-25 00:42:38 -07:00
Tobias Diekershoff
07535692dc
DE update to strings and templates
2012-05-25 06:04:33 +02:00
Simon
5bc0cfa067
Merge pull request #313 from fabrixxm/master
...
install wizard: fix php executable path
2012-05-24 16:30:22 -07:00
Simon L'nu
2a32917e3a
update dark a bit. i messed up some buttons
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-24 19:28:12 -04:00
root
60df67b9e3
fix small js error when user not logged in
2012-05-24 04:29:33 -04:00
root
a5b8339a75
install wizard: fix php executable path
...
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
2012-05-24 04:21:33 -04:00
friendica
f0ddcb979b
slackr: improve interactivity
2012-05-23 23:29:45 -07:00
friendica
6c78d42050
slackr: hide calendar when posting
2012-05-23 18:20:24 -07:00
friendica
5d06e0060d
Merge https://github.com/friendica/friendica into pull
2012-05-23 16:58:58 -07:00
friendica
60723702f1
more theme stuff
2012-05-23 16:58:31 -07:00
Simon L'nu
16f9d7fd35
clean up and more fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 19:22:07 -04:00
friendica
19bf0aa283
slackr - better highlighting of current selections
2012-05-23 16:16:59 -07:00
friendica
5b7865f8f9
slackr - knock the sharp edges off the events calendar
2012-05-23 15:55:09 -07:00
Simon
5acd0a1c32
Merge pull request #309 from fabrixxm/master
...
Update install wizard
2012-05-23 15:10:24 -07:00
Simon L'nu
5198260e3a
clean up and make nice the dispy photo edit stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 18:06:49 -04:00
Simon L'nu
789063da39
add a placeholder attribute on search-text; dispy fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
root
325343a492
Update install wizard
...
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
2012-05-23 07:38:31 -04:00
friendica
61dba985c1
photo rotation
2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef
event calendar theming
2012-05-22 22:34:35 -07:00
friendica
86a38cca24
import quattro event reminder
2012-05-22 22:06:52 -07:00
friendica
af495879af
mark bubbles unsupported
2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859
keep FB out of private notes
2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
2012-05-22 18:06:34 -07:00
friendica
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932
Fix darkzero/ns BB icon background colours.
2012-05-22 19:14:58 +01:00
friendica
f29f861d25
add queue totals to admin summary page
2012-05-22 03:44:03 -07:00
Tobias Diekershoff
be64437b14
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
Simon L'nu
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon L'nu
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
friendica
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
Simon L'nu
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon L'nu
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
2ac55c9f21
fix dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Thomas Willingham
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
Michael Vogel
8c80fe0bf5
Performance tests
2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97
Darkzero, another missing part of "everything"
2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad
Diabook-dark - some more cleaning up
2012-05-19 17:20:27 +01:00
Thomas Willingham
a1b96d11a7
Okay, so maybe not *everything*
2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42
Give Darkzero some loving.
...
Everything that used to be hidden with light text on light backgrounds is legible now.
2012-05-19 14:51:10 +01:00
Simon L'nu
4a35a51724
fix -desc again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-19 03:15:35 -04:00
friendica
3821744450
apply max-width to images in posts, duepuntozero
2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
Simon L'nu
331013f281
fix admin links...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 13:33:20 -04:00
Simon L'nu
a8a3732f05
*sigh*. fix dark *again*
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:51:29 -04:00
Simon L'nu
7eb73bc600
get rid of the monstrosity for .button. need to find alternate solution
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:32:08 -04:00
Simon L'nu
fca09c9d4c
slight re-design of wall stuff and css/font cleaning
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 01:58:55 -04:00
Tobias Diekershoff
68dc7c3568
DE strings
2012-05-15 10:44:01 +02:00
friendica
0faa0c2ab1
slackr drop shadows extended
2012-05-14 21:45:37 -07:00
Simon L'nu
db5fe14241
finish dipsy light colour fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-14 00:30:25 -04:00
tommy tomson
303856ce01
diabook-theme: small fixes
2012-05-13 20:51:39 +02:00
friendica
eaf028c9fb
Merge https://github.com/friendica/friendica into pull
2012-05-12 22:20:03 -07:00
friendica
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
Simon L'nu
93dc96e2cf
css fixes; new screenshots
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 18:53:01 -04:00
friendica
72d8e0459d
Merge pull request #294 from mschmitt/master
...
Esperanto at 100% again
2012-05-12 15:01:05 -07:00
Martin Schmitt
ae300bceb9
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.
2012-05-12 16:56:31 +02:00
Vasudev Kamath
3a45d4f9e0
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 20:20:26 +05:30
tommy tomson
9699d9cd01
diabook-theme: fix in earthlayers
2012-05-12 16:11:46 +02:00
tommy tomson
2882012e1b
diabook-theme: some fixes
2012-05-12 13:50:22 +02:00
Simon L'nu
c6897d0dc4
finished migrating dispy light - maybe
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 07:29:36 -04:00
Vasudev Kamath
10db2f00f9
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 12:10:09 +05:30
Thomas Willingham
2454028ef6
Darkzero - fixed notifications bar.
2012-05-12 00:32:47 +01:00
tommy tomson
48c48d644f
diabook-theme: update mapquery and small fix
2012-05-11 16:41:16 +02:00
tommy tomson
74e79a06a8
diabook-theme: add "population density 2010"-layer to EarthLayers-box
2012-05-11 14:56:59 +02:00
friendica
49cd3f615d
Merge https://github.com/friendica/friendica into pull
2012-05-11 04:05:25 -07:00
tommy tomson
f9d5e602ac
diabook-theme:small fix
2012-05-11 13:04:25 +02:00
friendica
7600b9b1ee
Merge https://github.com/friendica/friendica into pull
2012-05-11 03:42:05 -07:00
friendica
496782e468
moderated comment templates
2012-05-11 03:41:29 -07:00
tommy tomson
e13e5070a7
diabook-theme: small fix
2012-05-11 09:01:58 +02:00
tommy tomson
a81faead6e
diabook-theme: include prv_message autocomplete
2012-05-11 08:39:39 +02:00
friendica
8a5dcf64d8
fix PM replies after autocomplete changes
2012-05-10 20:01:13 -07:00
tommy tomson
b2bd25a470
Merge remote-tracking branch 'origin/master'
2012-05-11 02:40:09 +02:00
tommy tomson
ccc825ccbc
diabook-theme: small fix
2012-05-11 02:39:54 +02:00
Thomas Willingham
e7b8e839ae
Diabook-dark. More touchups.
2012-05-10 17:14:27 +01:00
friendica
c5f6755bdd
specified background image does not exist
2012-05-10 05:49:48 -07:00
tommy tomson
3ac5d19b92
diabook-theme: some fixes
2012-05-10 12:19:51 +02:00
friendica
c9bb888611
priv mail autocomplete, improved contrast for darkzero, etc.
2012-05-10 02:01:08 -07:00
friendica
93ae6ee97b
Merge https://github.com/friendica/friendica into pull
2012-05-10 01:46:29 -07:00
friendica
774c51cc19
email autocomplete
2012-05-10 01:45:51 -07:00
tommy tomson
7b41c0a555
Merge remote-tracking branch 'origin/master'
2012-05-10 09:54:47 +02:00
tommy tomson
69b43582d0
diabook-theme: some css/bug-fixes
2012-05-10 09:54:16 +02:00
Simon L'nu
a077e63fa5
don't make -desc so obnoxious looking
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-10 02:27:48 -04:00
Thomas Willingham
89d3ce7b5d
Diabook-dark - do things the right way instead of the stupid way.
2012-05-09 04:54:17 +01:00
Thomas Willingham
d2bbd92889
Fix TinyMCE, but needs adding to theme.php
2012-05-09 03:42:09 +01:00
Thomas Willingham
8a1f8515ca
Fix jquery.fancybox, but still needs adding to theme.php
2012-05-09 03:31:56 +01:00
Thomas Willingham
a0293ae442
Diabook-dark cleaned up a bit.
2012-05-09 03:21:26 +01:00
friendica
a048fd806a
don't provide 'show more' on remote friends in common unless there are actually more
2012-05-08 17:40:56 -07:00
Tobias Diekershoff
d2c2063084
DE update for the strings
2012-05-08 09:56:05 +02:00
tommy tomson
88443ed3fb
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
2012-05-08 03:29:25 +02:00
friendica
e8b9b8a403
separate poll_interval from delivery_interval - default is the same.
2012-05-07 04:21:54 -07:00
Simon L'nu
e554530430
more css tweaks. nothing major
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
tommy tomson
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
Simon L'nu
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
tommy tomson
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
tommy tomson
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
friendica
8f26e698e6
Merge pull request #289 from cvogeley/master
...
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
Tobias Diekershoff
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
Christian Vogeley
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
Simon L'nu
20ea1b7d4b
fix lightbox; finished dark, now on to light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-04 17:06:17 -04:00
Martin Schmitt
52f4563f30
Esperanto 100%
2012-05-04 12:02:05 +02:00
friendica
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
Tobias Diekershoff
22c8fe46a5
DE strings
2012-05-04 07:30:49 +02:00
friendica
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
Ludovic Grossard
1f86205ee8
proofreading the mail templates in fr
...
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
Simon L'nu
bb081e4bf5
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:35:21 -04:00
Simon L'nu
1a13c56fef
major reworking of dispy dark. light to follow
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:25:18 -04:00
tommy tomson
d72db2e1aa
diabook-theme: small fix
2012-05-03 07:57:40 +02:00
tommy tomson
ff2ddc319d
diabook-theme: small fix
2012-05-03 06:25:23 +02:00
tommy tomson
3521e22333
diabook-theme: made boxes at right_aside sortable
2012-05-03 06:05:55 +02:00
Max Weller
f0c11cac4a
Moved Meta Viewport from global head.tpl to diabook's header
...
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.
I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534
diabook-theme: tryied to improve performance a bit
2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b
diabook-theme: fix footer/impressum
2012-05-02 12:40:51 +02:00
friendica
1fab28c413
fix size
2012-05-01 20:38:06 -07:00
friendica
066d69b21c
add template
2012-05-01 20:22:59 -07:00
friendica
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
Thomas Willingham
671a10f5d4
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
2012-05-01 21:37:49 +01:00
tommy tomson
ab556857f0
diabook-themes: small fix at "community pages"-box
2012-05-01 16:46:08 +02:00
Simon L'nu
6d3ba2825b
lighten bg and darken font on dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
e245ecddf2
sub-minor change to head.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: add "community profiles"-box to right_column
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
rev update
start adding tooltips to tab menus
fix join group notifications
* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f
diabook-themes: add "community profiles"-box to right_column
2012-05-01 06:21:40 +02:00
friendica
a3a55897e5
Merge https://github.com/friendica/friendica into pull
2012-04-30 19:04:28 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
2012-05-01 02:33:55 +02:00
Simon L'nu
9b7dac6ce1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
provide "xxx joined yyy" notifications
adding META viewport tag for better look on tablets
Update Esperanto to 100%
DE update to the strings
activitystreams schema constants for "join group"
missed a db field
typo in profile_selectors, fix remote tagging
not all profile selector choices have unique or direct translations
log db error strings in all cases
admin page to manage failed updates
improved db error logging
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664
Merge pull request #277 from mschmitt/master
...
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
Max Weller
9d8a0553ac
adding META viewport tag for better look on tablets
2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab
Update Esperanto to 100%
2012-04-30 09:00:03 +02:00
Tobias Diekershoff
f08dc392df
DE update to the strings
2012-04-30 08:39:12 +02:00
friendica
0153d86b7f
admin page to manage failed updates
2012-04-29 19:10:07 -07:00
Simon L'nu
34eb843fb4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
the heart should really be red.
fix location change notification
enhanced profile reporting for single values
add db field for removed account, which will also be the first test of update error checking
toggle to archive unfriends, though render them useless
indicate successful updates
diabook-themes: small fix
diabook-themes: bug/css-fixes
some constants for the db update failure possibilities
bring back the email and logging of update failures, but without the transactions
* master:
2012-04-29 22:06:16 -04:00
tommy tomson
920d40acf4
diabook-themes: small fix
2012-04-29 05:58:23 +02:00
tommy tomson
3d054341ef
diabook-themes: bug/css-fixes
2012-04-29 04:12:04 +02:00
friendica
7919d00399
bring back the email and logging of update failures, but without the transactions
2012-04-28 17:50:28 -07:00
Simon L'nu
ecd1dab373
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
a few more continues that should be returns
small bugfix. sometimes also avatar pics were rescaled
* master:
2012-04-28 20:16:25 -04:00
Christian Vogeley
3f586bb962
small bugfix. sometimes also avatar pics were rescaled
2012-04-28 20:15:10 +02:00
Simon L'nu
c661dc502f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
break up poller into separate processes
add tooltip title to common_tabs
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
Diabook-dark update, it's almost useable now (if you're lenient).
Added "important changes" to admin menu for admins who don't follow the github properly.
* master:
2012-04-28 05:29:03 -04:00
friendica
f163aed66d
break up poller into separate processes
2012-04-27 23:17:40 -07:00
friendica
3bb06cc3e4
add tooltip title to common_tabs
2012-04-27 19:47:52 -07:00
Thomas Willingham
4b553de79f
Diabook-dark update, it's almost useable now (if you're lenient).
2012-04-28 03:01:27 +01:00
Simon L'nu
3bfa3f2a13
fix #search-text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Thomas Willingham
adc2fc18a5
Added "important changes" to admin menu for admins who don't follow
...
the github properly.
2012-04-28 01:25:55 +01:00
friendica
26c53580d1
implement contact archival
2012-04-27 17:17:58 -07:00
Christian Vogeley
731379fa25
another attempt to fix lower tab behaviour on small screens, community back in tab area
2012-04-27 23:48:44 +02:00
Simon L'nu
64f3af49fa
remove extra netsearch-box and fix
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu
d0d79196ba
fix contact-friend stuff on profile sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 13:31:06 -04:00
Vasudev Kamath
214ec91a3f
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-27 22:43:26 +05:30
friendica
4b92e3543c
Merge https://github.com/friendica/friendica into pull
2012-04-27 02:31:37 -07:00
friendica
266eaae439
put community back on the lower tab. It belongs with message streams
2012-04-27 02:30:49 -07:00
Simon L'nu
deae1df3be
fix some css errors
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
friendica
153534bc70
Merge https://github.com/friendica/friendica into pull
2012-04-27 01:10:33 -07:00
friendica
f06a554e05
fix view contacts
2012-04-27 01:10:09 -07:00
Simon L'nu
b936e3a18a
fix 2 issues. contacts img in finder; wall filer title
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00
friendica
a1f94ac59f
reset qcomment selector after insert.
2012-04-26 21:53:40 -07:00
friendica
d3992b78e6
put fakelink back in birthday notice
2012-04-26 20:08:57 -07:00
friendica
dee36c1b04
birthday contact link goes to event page instead of remote profile
2012-04-26 20:02:42 -07:00
friendica
dd33599a1d
Merge https://github.com/friendica/friendica into pull
2012-04-26 19:56:25 -07:00
friendica
3c6cf1f19c
make comment edit icons look more like base theme
2012-04-26 19:55:20 -07:00
Simon L'nu
8834944952
fix s/color/colour/g issue
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 20:13:11 -04:00
friendica
3ee998dbaf
Merge pull request #267 from tomtom84/master
...
add link "remove account" to /mod/settings.php
2012-04-26 15:33:34 -07:00
Simon L'nu
d6116b6979
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 16:14:42 -04:00
tommy tomson
328568943e
diabook-themes: small-fix
2012-04-26 21:07:46 +02:00
friendica
82abb14bf9
Merge pull request #265 from cvogeley/master
...
cleanzero theme added
2012-04-26 01:35:50 -07:00
Simon L'nu
c1f1974e44
convert stylesheets to less, and compress output css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 02:38:18 -04:00
Thomas Willingham
20a9cdfc90
Diabook-dark more CSS fixes.
...
Slowly getting there.
2012-04-25 23:40:40 +01:00
Christian Vogeley
43a257f2f6
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:30:04 +02:00
Christian Vogeley
28370e320f
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:28:13 +02:00
Christian Vogeley
c0d4e39052
added BBCODE thing in comments
2012-04-25 21:08:31 +02:00
Christian Vogeley
4c1398c6b1
add cleanzero theme
2012-04-25 19:09:46 +02:00
friendica
37bc00094e
this turns out to be harder than I thought
2012-04-25 01:36:22 -07:00
friendica
38e822320c
Merge pull request #264 from mschmitt/master
...
Esperanto at 100% again
2012-04-25 00:25:05 -07:00
friendica
50f10a4fd7
Merge https://github.com/friendica/friendica into pull
2012-04-25 00:14:20 -07:00
friendica
ba0ade3380
cleanup - make bb-buttons vanish when comment closed
2012-04-25 00:13:36 -07:00
Martin Schmitt
15f7125df2
Esperanto at 100% again
2012-04-25 08:50:02 +02:00
tomtom84
5187faa595
Merge pull request #263 from tomtom84/master
...
diabook-themes: fix css to login.tpl
2012-04-24 18:42:32 -07:00
tommy tomson
9fe6333fd4
diabook-themes: fix css to login.tpl
2012-04-25 03:38:21 +02:00
friendica
5af80dbb89
restore qcomment selector
2012-04-24 18:23:48 -07:00
tommy tomson
e72eaf2408
zero-themes: add bbcode-toolbar to commentbox
2012-04-25 02:43:50 +02:00
tommy tomson
08b990a314
diabook-themes: small fix
2012-04-25 00:19:57 +02:00
friendica
5ebc221c28
Merge pull request #261 from fabrixxm/eventspage
...
Some tweak on events page and events/bitrhdays reminder
2012-04-24 14:50:22 -07:00
Thomas Willingham
a28fea987e
Diabook-dark css fix
2012-04-24 20:07:08 +01:00
Thomas Willingham
fade45ca76
Diabook-dark, couple of new icons, and another css fix.
2012-04-24 20:00:49 +01:00
Fabio Comuni
c9a8dbc322
quattro: small week calendar view for event/birthday reminders
2012-04-24 09:50:44 +02:00
Fabio Comuni
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
Fabio Comuni
fc61616c53
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
2012-04-24 08:12:30 +02:00
Martin Schmitt
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
Thomas Willingham
9443248fad
Improvements to diabook-dark
...
Still a long way to go, but some icons and a few CSS fixes
2012-04-24 04:55:39 +01:00
Tobias Diekershoff
af7abcea27
DE strings, correction of a typo
2012-04-23 20:55:48 +02:00
tommy tomson
a305cf9f5c
diabok-themes: fixed bug in green-wide and dark-wide
2012-04-23 18:42:37 +02:00
tommy tomson
c5c419a785
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
2012-04-23 17:22:22 +02:00
tommy tomson
d072c12e7d
diabook-themes: bugfix in admin-section
2012-04-23 15:47:18 +02:00
tommy tomson
e74ae8b031
diabook-themes: bugfix
2012-04-22 23:58:34 +02:00
tommy tomson
d6c8a14fb0
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
2012-04-22 22:31:44 +02:00
Tobias Diekershoff
9434b447f3
DE strings update
2012-04-22 13:13:27 +02:00
tommy tomson
c0a377e0de
diabook-themes: comment-bbcode-bugfix
2012-04-22 12:59:00 +02:00
Vasudev Kamath
f1d84c1045
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 12:08:05 +05:30
Simon L'nu
203aa819e2
fix tinymce theming
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-22 01:22:29 -04:00
tommy tomson
fe6567cb88
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
2012-04-22 03:15:06 +02:00
Simon L'nu
7a14f45904
fix checkbox/radio buttons for some browsers
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 20:18:47 -04:00
tommy tomson
8809e96310
diabook-themes: add diabook-dark
2012-04-21 01:06:17 +02:00
Vasudev Kamath
8465ad6e1e
Few more files with unnecessary executable permissions
2012-04-21 00:22:48 +05:30
tommy tomson
e052be606c
diabook-themes: add diabook-green and some minor css/bug-fixes
2012-04-20 17:16:42 +02:00
Simon
0e25376e4a
Merge pull request #254 from simonlnu/master
...
add some knobs to comment boxes
2012-04-20 03:43:55 -07:00
fabrixxm
16c308791f
Merge pull request #253 from fabrixxm/master
...
fix bug n385
2012-04-20 03:42:50 -07:00
Simon L'nu
5d2dd5798b
fix the buttons. don't hide the buttons once shown
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 06:42:08 -04:00
Simon L'nu
eb9ddb884a
optimise imgs; add some comment editing knobs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 05:56:54 -04:00
Fabio Comuni
6af5a3a485
escape email template var names. fix bug n385.
2012-04-20 11:39:36 +02:00
Fabio Comuni
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
tommy tomson
f5f1956e8b
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-20 01:44:21 +02:00
Simon L'nu
05173d0a8a
fix .item-select
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 13:02:41 -04:00
Simon L'nu
4fd1a17f06
tweak drop-down and add in filebrowser
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 12:54:53 -04:00
fabrixxm
44f4b4b9d1
Merge pull request #248 from fabrixxm/tmcefilebrowser
...
TinyMCE file browser
2012-04-19 00:30:45 -07:00
Martin Schmitt
25f6753a1f
Hadn't merged fixed typo from upstream.
2012-04-19 06:51:52 +02:00
Martin Schmitt
7e3c183601
EO translation fixes
2012-04-19 06:45:54 +02:00
Fabio Comuni
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455
filebrowser: more style, load min and max scale photos
2012-04-18 14:56:03 +02:00
Fabio Comuni
56efb42223
tinymce: add inlinepopups plugin
2012-04-18 14:55:21 +02:00