aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update nljeroenpraat2014-06-112-30/+30
* oops that's hex not decimalfriendica2014-06-101-1/+1
* issue #433friendica2014-06-104-6/+6
* merge the app menusfriendica2014-06-105-28/+35
* syntax errorfriendica2014-06-101-1/+1
* should really wait until after the first cuppafriendica2014-06-101-4/+5
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-102-154/+154
|\
| * update nl - there was an odd syntax error in strings.phpjeroenpraat2014-06-102-2/+2
| * Update nljeroenpraat2014-06-102-130/+130
| * Update nljeroenpraat2014-06-102-24/+24
* | remote install app (untested)friendica2014-06-104-4/+17
|/
* notify tweaksfriendica2014-06-091-0/+2
* allow rpost to take a channel argument (the channel nickname) and change chan...friendica2014-06-091-0/+11
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-092-5516/+5720
|\
| * update nljeroenpraat2014-06-091-4/+4
| * update nljeroenpraat2014-06-091-4/+4
| * update nljeroenpraat2014-06-092-5515/+5719
* | post appfriendica2014-06-093-1/+5
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-06-062-5681/+5508
|\
| * Merge pull request #481 from tuscanhobbit/masterPaolo T2014-06-062-5681/+5508
| |\
| | * IT: updated stringstuscanhobbit2014-06-062-5681/+5508
* | | doc updatesfriendica2014-06-0627-3421/+3629
|/ /
* | move hexit to addons where it belongsfriendica2014-06-054-185/+1
* | 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
| |/ / |/| |