aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-013-1/+6
|\
| * 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
| |\
| * | issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
* | | Merge branch 'master' into tresfriendica2015-01-315-18/+63
|\ \ \ | | |/ | |/|
| * | 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-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
| |\
| * | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-281-0/+10
* | | cleanup event form and various required indicators on inputsfriendica2015-01-291-1/+2
* | | Merge branch 'master' into tresfriendica2015-01-2929-212/+245
|\ \ \ | | |/ | |/|
| * | 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
| | |/ | |/|
| * | 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
| |/ /
* | | more message restrict conversionsfriendica2015-01-297-45/+44
* | | Merge branch 'master' into tresfriendica2015-01-278-134/+177
|\| |
| * | 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
* | | sql typofriendica2015-01-271-1/+1
* | | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-2615-94/+422
|\| |
| * | 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
| * | | don't set a rating of 1 on old sites that report poco rating as an array. Jus...friendica2015-01-251-1/+1
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 05:33:37 +0000