aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-052-23/+65
|\
| * 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-0513-35/+397
| |\
| * | escape datesHabeas Codice2015-02-051-1/+1
* | | author profile photo in reshare wasn't linkedfriendica2015-02-051-1/+1
| |/ |/|
* | 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-042-12/+32
* | 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-042-0/+33
|/ /
* | order ratings friends firstfriendica2015-02-031-4/+0
* | final cleanup on ratings featurefriendica2015-02-031-0/+1
* | finish off the sync functionsfriendica2015-02-031-0/+43
* | ratings - mopping up, most everything but directory sync implementedfriendica2015-02-031-0/+3
* | Merge branch 'master' into pocoratefriendica2015-02-032-2/+7
|\ \
| * | garbage in garbage outfriendica2015-02-032-2/+7
* | | send rating information to directoriesfriendica2015-02-023-24/+153
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-021-0/+75
|\ \
| * | 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-021-0/+74
* | | issue #889 private tags for forums no longer recognised after tag refactor a ...friendica2015-02-022-0/+4
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-011-0/+1
|\ \
| * | 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-011-0/+4
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-311-1/+1
|\|
| * prevent silly fake null date from causing problems OTW from older buildsHabeas Codice2015-01-301-1/+1
* | issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
|/
* sync_locations() toggle DB flag functions were broken - result of postgres ch...friendica2015-01-301-4/+22
* fix random profilesfriendica2015-01-301-2/+3
* let zot_refresh continue without a primary hub if one cannot be found. also w...friendica2015-01-301-5/+14
* bring back inline imagesfriendica2015-01-291-6/+15
* Merge branch 'master' into pocoratefriendica2015-01-2929-200/+183
|\
| * implement diaspora profile message (oops) or updated profile photos won't be ...friendica2015-01-291-21/+4
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-282-3/+3
| |\
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-289-144/+446
| | |\
| | * | bookmarkedchats: remove extraneous group by, dupes removed on insertHabeas Codice2015-01-281-2/+2
| | * | fix improper group by usageHabeas Codice2015-01-281-1/+1
| * | | remote_user => remote_channelfriendica2015-01-287-13/+13
| * | | local_user => local_channelfriendica2015-01-2827-171/+171
| | |/ | |/|