aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-01-29167-954/+1001
|\
| * implement diaspora profile message (oops) or updated profile photos won't be ...friendica2015-01-292-22/+5
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-284-5/+7
| |\
| | * postgres does not support the , syntax. a ; would work, if it weren't stateme...Habeas Codice2015-01-281-1/+3
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-2827-388/+604
| | |\
| | * | bookmarkedchats: remove extraneous group by, dupes removed on insertHabeas Codice2015-01-281-2/+2
| | * | fix improper group by usageHabeas Codice2015-01-281-1/+1
| | * | fix implicit booleanHabeas Codice2015-01-281-1/+1
| * | | provide compatibility functions so code breakage with customised setups or wo...friendica2015-01-281-0/+12
| * | | remote_user => remote_channelfriendica2015-01-2833-47/+47
| * | | local_user => local_channelfriendica2015-01-28155-886/+886
| | |/ | |/|
| * | 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
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-4/+2
| |\ \
| | * | fix /view/de/lostpass_eml.tplmarijus2015-01-281-4/+2
| * | | Revert "issue with de email template (lostpass_eml.tpl)"friendica2015-01-281-1/+1
| * | | issue with de email template (lostpass_eml.tpl)friendica2015-01-281-1/+1
| |/ /
| * | add yet another firehose checkfriendica2015-01-281-1/+1
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-283-2/+5
| |\ \
| | * | show shared button only to local usermarijus2015-01-282-1/+4
| | * | no need for new line here - spacing is done via cssmarijus2015-01-281-1/+1
| * | | more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-282-3/+6
| |/ /
* | | more message restrict conversionsfriendica2015-01-2918-75/+78
* | | Merge branch 'master' into tresfriendica2015-01-2720-166/+302
|\| |
| * | allow RSS connections in the type 'a' autocomplete results as that is used fo...friendica2015-01-271-3/+7
| * | 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
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-276-102/+154
| |\ \
| | * | tpl and css cleanupmarijus2015-01-272-12/+5
| | * | move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser...marijus2015-01-276-102/+161
| * | | allow doc/help system to use subdirsfriendica2015-01-272-7/+15
| |/ /
| * | superblock enhancementsfriendica2015-01-262-5/+10
| * | handle an incoming directory rating messagefriendica2015-01-261-2/+45
| * | provide storage for directory based reputation in the xlink table by setting ...friendica2015-01-267-11/+28
* | | sql typofriendica2015-01-271-1/+1
* | | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-2699-1998/+1864
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-264-4/+5
| |\|
| | * Add pg support channel to external resourcesHabeas Codice2015-01-251-0/+1
| | * Merge pull request #878 from habeascodice/masterRedMatrix2015-01-263-4/+4
| | |\
| | | * typoHabeas Codice2015-01-251-1/+1
| | | * update schemaHabeas Codice2015-01-251-1/+1
| | | * suppress notices that might be confusingHabeas Codice2015-01-251-2/+2
| | | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-246-596/+31
| | | |\
| | | * | remove superfluous group byHabeas Codice2015-01-241-1/+1
| * | | | provide a json feed of search resultsfriendica2015-01-262-1/+18
| * | | | abstract poco into a single function in socgraph so we can provide different ...friendica2015-01-253-207/+220
| |/ / /
| * | | we also don't need a profile selector when editing our default permissions.friendica2015-01-251-0/+2
| * | | don't hide the scary stuff when editing self permissions.friendica2015-01-251-2/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 10:38:31 +0000