aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* / | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-281-0/+10
|/ /
* | make sure we honour the disable_discover_tab preffriendica2015-01-281-1/+5
* | allow diaspora posts to be delivered to the discover channel unless prohibite...friendica2015-01-281-1/+5
* | limit the number of forums that can be tagged in a single post - default is 2...friendica2015-01-281-8/+46
* | add yet another firehose checkfriendica2015-01-281-1/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-1/+2
|\ \
| * | show shared button only to local usermarijus2015-01-281-1/+2
* | | more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-281-2/+5
|/ /
* | ignore route mismatches on firehose posts to the sys channel. Use whatever pa...friendica2015-01-271-1/+1
* | we need to actually ask for the id from the DB if we want to use it.friendica2015-01-271-1/+1
* | improved route mismatch detection. We will be less strict about the absolute ...friendica2015-01-272-35/+42
* | move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser...marijus2015-01-272-88/+78
* | superblock enhancementsfriendica2015-01-261-0/+1
* | handle an incoming directory rating messagefriendica2015-01-261-2/+45
* | provide storage for directory based reputation in the xlink table by setting ...friendica2015-01-263-8/+10
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-261-1/+1
|\|
| * Merge pull request #878 from habeascodice/masterRedMatrix2015-01-261-1/+1
| |\
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-242-7/+31
| | |\
| | * | remove superfluous group byHabeas Codice2015-01-241-1/+1
* | | | abstract poco into a single function in socgraph so we can provide different ...friendica2015-01-251-0/+209
|/ / /
* | | turn "large photo thumbnails" into a feature.friendica2015-01-252-6/+12
* | | rework the new connection stuff so we don't need a "permissions have been cha...friendica2015-01-251-14/+9
* | | recognise opus as an audio filefriendica2015-01-252-2/+2