Simon
552895001c
Merge pull request #268 from simonlnu/master
...
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
2012-04-26 13:23:23 -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
Simon L'nu
bd14fdec6e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update, fix autoname test "random" failure
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
added BBCODE thing in comments
add cleanzero theme
* master:
2012-04-26 16:10:17 -04:00
tommy tomson
328568943e
diabook-themes: small-fix
2012-04-26 21:07:46 +02:00
tommy tomson
77a0570162
add link "remove account" to /mod/settings.php
2012-04-26 17:21:27 +02:00
friendica
82abb14bf9
Merge pull request #265 from cvogeley/master
...
cleanzero theme added
2012-04-26 01:35:50 -07:00
friendica
bf97ad2010
Merge https://github.com/friendica/friendica into pull
2012-04-26 01:34:21 -07:00
friendica
78579627ce
rev update, fix autoname test "random" failure
2012-04-26 01:33:41 -07:00
Simon
f6f666e38a
Merge pull request #266 from simonlnu/master
...
convert stylesheets to less, and compress output css
2012-04-25 23:45:32 -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
Simon L'nu
6b830bfa97
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Diabook-dark more CSS fixes.
* master:
2012-04-26 00:20:00 -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
Simon L'nu
78280bdfed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #307 , explaining decentralised private photos is impossible.
this turns out to be harder than I thought
cleanup - make bb-buttons vanish when comment closed
Esperanto at 100% again
* master:
2012-04-25 13:47:20 -04:00
Christian Vogeley
4c1398c6b1
add cleanzero theme
2012-04-25 19:09:46 +02:00
friendica
c9e5609cbf
bug #307 , explaining decentralised private photos is impossible.
2012-04-25 05:41:32 -07: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
zottel
0116426a0e
Merge remote branch 'upstream/master'
2012-04-25 09:07:36 +02:00
Simon L'nu
1a1efc7e46
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: fix css to login.tpl
restore qcomment selector
rev update
zero-themes: add bbcode-toolbar to commentbox
diabook-themes: small fix
Diabook-dark css fix
Diabook-dark, couple of new icons, and another css fix.
fix tags test with new url
quattro: small week calendar view for event/birthday reminders
remove html from get_birthdays() and get_events()
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
* master:
2012-04-25 03:05:47 -04: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
friendica
139c2c1bbd
Merge https://github.com/friendica/friendica into pull
2012-04-24 17:55:56 -07:00
friendica
a5f9e67c9f
rev update
2012-04-24 17:55:35 -07:00
friendica
75828b4750
Merge pull request #262 from tomtom84/master
...
zero-themes: add bbcode-toolbar to commentbox
2012-04-24 17:54:41 -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
zottel
912e008ded
Merge remote branch 'upstream/master'
2012-04-24 10:38:23 +02:00
friendica
fbdb8fc43a
fix tags test with new url
2012-04-24 01:02:22 -07: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
Simon L'nu
0e2c6c2819
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
separate tag search from body search
Esperanto at 100% again
Improvements to diabook-dark
move unfriend to standalone function for use in account removal
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
* master:
2012-04-24 03:33:46 -04: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
friendica
7923404c83
Merge https://github.com/friendica/friendica into pull
2012-04-23 22:42:48 -07:00
friendica
2064d86cb3
separate tag search from body search
2012-04-23 22:41:32 -07:00
friendica
3299365c76
Merge pull request #260 from mschmitt/master
...
Esperanto at 100% again
2012-04-23 22:22:05 -07:00
Martin Schmitt
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
friendica
822ecf41bd
Merge pull request #259 from beardy-unixer/master
...
Diabook-dark
2012-04-23 21:10:53 -07: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
Thomas Willingham
92820c5181
Merge remote-tracking branch 'upstream/master'
...
Merge upstream
2012-04-24 04:54:14 +01:00
friendica
3637534119
move unfriend to standalone function for use in account removal
2012-04-23 19:42:57 -07:00
