aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * | | Merge branch 'master' into pocoratefriendica2015-02-022-0/+77
| |\| |
| | * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-022-0/+77
| | |\ \
| | | * | comment out latest changes - needs more testingmarijus2015-02-021-4/+4
| | | * | comment this out for now - it is not always truemarijus2015-02-021-2/+2
| | | * | one important line missingmarijus2015-02-021-0/+1
| | | * | we also need folder heremarijus2015-02-021-1/+1
| | | * | typomarijus2015-02-021-1/+1
| | | * | just select permsmarijus2015-02-021-1/+1
| | | * | respect parent dir permissionsmarijus2015-02-022-0/+76
| | * | | Merge branch 'pocorate'; commit '043ff33'friendica2015-02-020-0/+0
| * | | | add signaturesfriendica2015-02-021-4/+12
| |/ / /
| * / / issue #889 private tags for forums no longer recognised after tag refactor a ...friendica2015-02-022-0/+4
| |/ /
* | | Merge branch 'master' into tresfriendica2015-02-0112-10/+108
|\| |
| * | admin/dbsync not reporting failed updatesfriendica2015-02-012-2/+2
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-012-3/+4
| |\ \
| | * | typo, see #884jeroenpraat2015-02-021-3/+3
| | * | add multipart/mixed to getIconFromType()marijus2015-02-011-0/+1
| * | | two tracks proceeding in parallel - first adding the ability to store a digit...friendica2015-02-018-4/+101
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-313-6/+16
| |\|
| * | issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
| * | revupfriendica2015-01-311-1/+1
* | | Merge branch 'master' into tresfriendica2015-01-31108-4218/+5439
|\ \ \ | | |/ | |/|
| * | Add more detail about directory_mode settings to default config and docsHabeas Codice2015-01-302-5/+15
| * | prevent silly fake null date from causing problems OTW from older buildsHabeas Codice2015-01-301-1/+1
| |/
| * sync_locations() toggle DB flag functions were broken - result of postgres ch...friendica2015-01-306-4/+751
| * fix random profilesfriendica2015-01-301-2/+3
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-301-1/+1
| |\
| | * better cross-browser compatibility for td hover colourmarijus2015-01-301-1/+1
| * | let zot_refresh continue without a primary hub if one cannot be found. also w...friendica2015-01-3086-4189/+4483
| |/
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-302-1/+5
| |\
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-292-1/+5
| * | how did that stuff merge? grrrr....friendica2015-01-292-3/+3