This website requires JavaScript.
c9e5609cbf
bug #307 , explaining decentralised private photos is impossible.
2012-04-25 05:41:32 -07:00
37bc00094e
this turns out to be harder than I thought
2012-04-25 01:36:22 -07:00
38e822320c
Merge pull request #264 from mschmitt/master
2012-04-25 00:25:05 -07:00
50f10a4fd7
Merge https://github.com/friendica/friendica into pull
2012-04-25 00:14:20 -07:00
ba0ade3380
cleanup - make bb-buttons vanish when comment closed
2012-04-25 00:13:36 -07:00
0116426a0e
Merge remote branch 'upstream/master'
2012-04-25 09:07:36 +02:00
1a1efc7e46
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-25 03:05:47 -04:00
15f7125df2
Esperanto at 100% again
2012-04-25 08:50:02 +02:00
5187faa595
Merge pull request #263 from tomtom84/master
2012-04-24 18:42:32 -07:00
9fe6333fd4
diabook-themes: fix css to login.tpl
2012-04-25 03:38:21 +02:00
5af80dbb89
restore qcomment selector
2012-04-24 18:23:48 -07:00
139c2c1bbd
Merge https://github.com/friendica/friendica into pull
2012-04-24 17:55:56 -07:00
a5f9e67c9f
rev update
2012-04-24 17:55:35 -07:00
75828b4750
Merge pull request #262 from tomtom84/master
2012-04-24 17:54:41 -07:00
e72eaf2408
zero-themes: add bbcode-toolbar to commentbox
2012-04-25 02:43:50 +02:00
08b990a314
diabook-themes: small fix
2012-04-25 00:19:57 +02:00
5ebc221c28
Merge pull request #261 from fabrixxm/eventspage
2012-04-24 14:50:22 -07:00
a28fea987e
Diabook-dark css fix
2012-04-24 20:07:08 +01:00
fade45ca76
Diabook-dark, couple of new icons, and another css fix.
2012-04-24 20:00:49 +01:00
912e008ded
Merge remote branch 'upstream/master'
2012-04-24 10:38:23 +02:00
fbdb8fc43a
fix tags test with new url
2012-04-24 01:02:22 -07:00
c9a8dbc322
quattro: small week calendar view for event/birthday reminders
2012-04-24 09:50:44 +02:00
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
0e2c6c2819
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-24 03:33:46 -04:00
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
7923404c83
Merge https://github.com/friendica/friendica into pull
2012-04-23 22:42:48 -07:00
2064d86cb3
separate tag search from body search
2012-04-23 22:41:32 -07:00
3299365c76
Merge pull request #260 from mschmitt/master
2012-04-23 22:22:05 -07:00
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
822ecf41bd
Merge pull request #259 from beardy-unixer/master
2012-04-23 21:10:53 -07:00
9443248fad
Improvements to diabook-dark
2012-04-24 04:55:39 +01:00
92820c5181
Merge remote-tracking branch 'upstream/master'
2012-04-24 04:54:14 +01:00
3637534119
move unfriend to standalone function for use in account removal
2012-04-23 19:42:57 -07:00
f265863435
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
2012-04-23 18:28:33 -07:00
8a80ea24d1
Merge remote-tracking branch 'upstream/master'
2012-04-24 02:18:51 +01:00
6e9485605f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-23 18:25:14 -04:00
af7abcea27
DE strings, correction of a typo
2012-04-23 20:55:48 +02:00
a305cf9f5c
diabok-themes: fixed bug in green-wide and dark-wide
2012-04-23 18:42:37 +02:00
c5c419a785
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
2012-04-23 17:22:22 +02:00
d072c12e7d
diabook-themes: bugfix in admin-section
2012-04-23 15:47:18 +02:00
e9e4fb664a
allow bbcode representation of html symbols such as © by wrapping in bb brackets
2012-04-23 05:42:46 -07:00
8f0f644295
protect jappixmini/proxy from typo check, more work on email2 connector
2012-04-23 05:16:57 -07:00
e6847cdd3f
Merge remote branch 'upstream/master'
2012-04-23 08:57:49 +02:00
29d7f260d7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-22 22:22:52 -04:00
2170df897b
bug #388 - notify_comment received after post deleted
2012-04-22 19:19:02 -07:00
724e1d15d0
Merge https://github.com/friendica/friendica into pull
2012-04-22 16:25:02 -07:00
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
c0dffa7442
Merge pull request #258 from unary/api
2012-04-22 15:43:24 -07:00
3c6c5d4749
Merge pull request #257 from CatoTH/master
2012-04-22 15:41:47 -07:00
e74ae8b031
diabook-themes: bugfix
2012-04-22 23:58:34 +02:00
d6c8a14fb0
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
2012-04-22 22:31:44 +02:00
76aa9b3037
api: add support for StatusNet-style media param to API
2012-04-22 13:37:25 -04:00
75c228fa13
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-22 12:27:59 -04:00
a3f08c44be
API: RSS-Feeds are now shortened to 1000 characters. (With added link)
2012-04-22 18:00:24 +02:00
27c23229c4
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 13:31:07 +00:00
3116db1a74
Add a hook
2012-04-22 13:28:54 +00:00
9434b447f3
DE strings update
2012-04-22 13:13:27 +02:00
c0a377e0de
diabook-themes: comment-bbcode-bugfix
2012-04-22 12:59:00 +02:00
f1d84c1045
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 12:08:05 +05:30
54817f058a
Merge pull request #256 from simonlnu/master
2012-04-21 22:23:13 -07:00
203aa819e2
fix tinymce theming
2012-04-22 01:22:29 -04:00
f99d9e4d7f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-22 01:17:13 -04:00
d340b80094
Merge https://github.com/friendica/friendica into pull
2012-04-21 19:29:08 -07:00
371f3e450e
rev update
2012-04-21 19:28:45 -07:00
fe6567cb88
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
2012-04-22 03:15:06 +02:00
71e2dbf352
Merge commit 'upstream/master'
2012-04-21 19:26:24 +02:00
2d129e7455
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-21 04:34:56 -04:00
bdbe068b95
rev update
2012-04-21 01:18:46 -07:00
4499ce96a0
Executable permission missing on script
2012-04-21 12:00:19 +05:30
7bae290aeb
Merge pull request #255 from simonlnu/master
2012-04-20 17:19:49 -07:00
7a14f45904
fix checkbox/radio buttons for some browsers
2012-04-20 20:18:47 -04:00
172aff1c2b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-20 20:16:06 -04:00
8809e96310
diabook-themes: add diabook-dark
2012-04-21 01:06:17 +02:00
8465ad6e1e
Few more files with unnecessary executable permissions
2012-04-21 00:22:48 +05:30
e052be606c
diabook-themes: add diabook-green and some minor css/bug-fixes
2012-04-20 17:16:42 +02:00
30bbbf32e5
rev update
2012-04-20 06:31:38 -07:00
9663299da1
Merge remote branch 'upstream/master'
2012-04-20 13:42:33 +02:00
0e25376e4a
Merge pull request #254 from simonlnu/master
2012-04-20 03:43:55 -07:00
16c308791f
Merge pull request #253 from fabrixxm/master
2012-04-20 03:42:50 -07:00
5d2dd5798b
fix the buttons. don't hide the buttons once shown
2012-04-20 06:42:08 -04:00
eb9ddb884a
optimise imgs; add some comment editing knobs
2012-04-20 05:56:54 -04:00
1c88a7ef5d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-20 05:52:08 -04:00
6af5a3a485
escape email template var names. fix bug n385.
2012-04-20 11:39:36 +02:00
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
83683b516e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-20 00:02:18 -04:00
c88dd1485f
Merge pull request #252 from tomtom84/master
2012-04-19 16:55:24 -07:00
f5f1956e8b
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-20 01:44:20 +02:00
ccdac0cd99
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-19 18:47:54 -04:00
4a292e4137
Merge pull request #251 from simonlnu/master
2012-04-19 10:41:25 -07:00
6055d636ed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-19 13:02:52 -04:00
05173d0a8a
fix .item-select
2012-04-19 13:02:41 -04:00
51967edfe8
Merge pull request #250 from simonlnu/master
2012-04-19 09:55:36 -07:00
4fd1a17f06
tweak drop-down and add in filebrowser
2012-04-19 12:54:53 -04:00
caa6bc96f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-19 12:32:09 -04:00
44f4b4b9d1
Merge pull request #248 from fabrixxm/tmcefilebrowser
2012-04-19 00:30:45 -07:00
42e120586c
Merge pull request #249 from mschmitt/master
2012-04-18 23:18:50 -07:00
25f6753a1f
Hadn't merged fixed typo from upstream.
2012-04-19 06:51:52 +02:00
7e3c183601
EO translation fixes
2012-04-19 06:45:54 +02:00
5916bc6539
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-18 23:48:41 -04:00
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
friendica
zottel
Simon L'nu
Martin Schmitt
tomtom84
tommy tomson
Thomas Willingham
Fabio Comuni
Tobias Diekershoff
Michael Johnston
Michael Vogel
Tobias Hößl
Vasudev Kamath
Simon