aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-0545-5364/+6398
|\
| * allow post expiration to be set from a config (and therefore a plugin/addon)friendica2015-02-051-1/+4
| * over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
| * another issue with diaspora postings to sys channel - sys has no connections,...friendica2015-02-051-6/+14
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-053-27/+70
| |\
| | * typomarijus2015-02-051-1/+1
| | * forgot to remove some debug stuffmarijus2015-02-051-2/+0
| | * make file activity respect parent dir permissions workmarijus2015-02-051-22/+66
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-0549-5349/+6405
| | |\
| | * | escape datesHabeas Codice2015-02-051-1/+1
| | * | typo/cleanup pg onlyHabeas Codice2015-02-051-4/+5
| * | | collapse overly-verbose ratingsfriendica2015-02-052-1/+5
| * | | increase size of rating value to make it stand out a bit.friendica2015-02-053-13/+6
| * | | author profile photo in reshare wasn't linkedfriendica2015-02-053-2/+14
| | |/ | |/|
| * | diaspora public posts not delivering to sys channel if there were no other su...friendica2015-02-041-4/+9
| * | forgot to add the self exclusionfriendica2015-02-041-2/+4
| * | allow anybody to view ratings - including oneself. Only allow authenticated f...friendica2015-02-041-9/+9
| * | add 'view ratings' to the widget. It's actually two stacked widgets rather th...friendica2015-02-041-2/+6
| * | honour the rating enable setting (which we really do need to rename since it ...friendica2015-02-041-0/+5
| * | remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-048-15/+228
| * | add the required js filefriendica2015-02-041-0/+34
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-041-28/+60
| |\ \
| | * | not quite there yet but getting closer a littlemarijus2015-02-041-28/+60
| * | | first cut at rating widget. The flaw is that it is limited because it require...friendica2015-02-048-25/+82
| |/ /
| * | hide channel address in directory from hovertip if not logged into the matrixfriendica2015-02-031-1/+1
| * | remove extra debuggingfriendica2015-02-031-2/+1
| * | probably enough for now - couldn't get the censorship filter in today, I thin...friendica2015-02-033-7/+8
| * | order ratings friends firstfriendica2015-02-033-6/+18
| * | final cleanup on ratings featurefriendica2015-02-038-11/+57
| * | finish off the sync functionsfriendica2015-02-032-2/+46
| * | ratings - mopping up, most everything but directory sync implementedfriendica2015-02-039-43/+57
| * | rating form workfriendica2015-02-034-1/+22
| * | Merge branch 'master' into pocoratefriendica2015-02-032-2/+7
| |\ \
| | * | garbage in garbage outfriendica2015-02-032-2/+7
| * | | that didn't look so good on a small screen - let it hang out on the right marginfriendica2015-02-031-2/+1
| * | | styling for the directory page when it comes to ratingsfriendica2015-02-037-27/+19
| * | | honour block public setting - especially for standalonesfriendica2015-02-033-1/+24
| * | | run ratingsearch on the serverfriendica2015-02-035-36/+88
| * | | Merge branch 'master' into pocoratefriendica2015-02-033-5148/+5286
| |\| |
| | * | Merge branch 'master' of https://github.com/friendica/redjeroenpraat2015-02-030-0/+0
| | |\ \
| | | * | Fixed height of items in dropdown notification lists. They overlapped when th...jeroen2015-02-031-0/+7
| | * | | Fixed height of items in dropdown notification lists. They overlapped when th...jeroenpraat2015-02-031-0/+7
| | |/ /
| | * | NL on 100 percent again :/jeroen2015-02-032-5148/+5279
| * | | for now punt if have no poi, but we should get it from the serverfriendica2015-02-031-1/+1
| * | | start to tie ratings to the directory pagefriendica2015-02-022-4/+8
| * | | add ratings to the directory sync arraysfriendica2015-02-021-0/+17
| * | | send rating information to directoriesfriendica2015-02-025-28/+157
| * | | sign the ratings, fix the bugsfriendica2015-02-023-6/+15
| * | | Merge branch 'master' into pocoratefriendica2015-02-022-3/+15
| |\| |
| | * | improved directory registration - honour standalones and do the right thingfriendica2015-02-022-3/+15