aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-053-32/+34
|\
| * move new comment open/close js functions to core so they can be used by other...marijus2014-06-053-32/+34
* | Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-0512-5919/+6215
|\|
| * we probably want a seperate namespace to not disable all click events in docu...marijus2014-06-051-4/+4
| * possible fix for 2nd comment collapsingmarijus2014-06-051-4/+16
| * Merge pull request #480 from solstag/masterRedMatrix2014-06-052-5913/+5966
| |\
| | * update pt-br translationAlexandre Hannud Abdo2014-06-052-5913/+5966
| |/
| * features appfriendica2014-06-042-0/+4
| * hexit appfriendica2014-06-042-0/+3
| * poke notificationsfriendica2014-06-041-0/+28
| * hex converter - could've been a plugin and perhaps should have been but this ...friendica2014-06-041-0/+181
| * duplicate birthday events showing upfriendica2014-06-042-2/+9
| * add zrl stuff - still a lot of new stuff missing but I'm not going to do it all.friendica2014-06-041-0/+8
* | Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-0419-23/+109
|\|
| * if photo import failed during channel import, reset the xchan_photo_date so i...friendica2014-06-042-2/+8
| * add an icon to connect actionsfriendica2014-06-037-5/+10
| * suggest appfriendica2014-06-033-1/+7
| * don't add a birthday event if the birthday channel doesn't have permission to...friendica2014-06-032-1/+6
| * don't provide a second (actually third counting the navbar) search box on the...friendica2014-06-032-2/+3
| * add sys channel (discover) posts to "anonymous" search. They will by default ...friendica2014-06-032-9/+18
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-06-0310-5609/+5471
| |\
| | * Doco - couple of typosThomas Willingham2014-06-031-3/+3
| | * Doco - 10% of the issues take up 90% of the time. The worst offenders are do...Thomas Willingham2014-06-032-1/+40
| | * Revert that - sorry, pushed to the wrong repo. We probably want thatThomas Willingham2014-06-031-2/+1
| | * Crude, but working bellendian filter.Thomas Willingham2014-06-031-1/+2
| * | make system generated birthday events un-commentable since comments won't go ...friendica2014-06-032-3/+18
* | | expand/collapse is also used for comments, so removing 'post'.jeroenpraat2014-06-034-11/+11
| |/ |/|
* | With a new logo, also comes a new favicon and other rm-icons off course. Plea...jeroenpraat2014-06-033-0/+0
* | Updated strings for show entire post and show less to expand and collapse. Se...jeroenpraat2014-06-035-5608/+5431
|/
* Updated to [+] show more, [+] show more comments, etc. See https://redmatrix....jeroenpraat2014-06-035-3613/+3462
* cross some more stuff off the to-do listfriendica2014-06-022-2/+2
* add alpha channelfriendica2014-06-021-0/+0
* image updatefriendica2014-06-021-0/+0
* issue #479 - tag escaping not needed here.friendica2014-06-021-8/+8
* update stringsfriendica2014-06-021-49/+63
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-022-327/+327
|\
| * Update nl before doing something newjeroenpraat2014-06-022-124/+124
| * Update nljeroenpraat2014-06-022-24/+24
| * Update nljeroenpraat2014-06-022-181/+181
* | bring back birthdaysfriendica2014-06-025-11/+77
|/
* better scalingfriendica2014-06-022-1/+1
* probe appfriendica2014-06-012-0/+4
* don't show app editing options to non-authenticated folksfriendica2014-06-012-0/+3
* minor stylistic improvementsfriendica2014-06-011-4/+3
* minor tweaksfriendica2014-06-012-4/+4
* remove a few old iconsfriendica2014-06-0117-0/+0
* remove banner experimentfriendica2014-06-012-122/+0
* add a few days of slop to the orphan finder to account for any lags in dir sy...friendica2014-06-011-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-0112-0/+9861
|\
| * idemjeroenpraat2014-06-012-4/+4