aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-2/+8
|\
| * fix for forked thread on diasporaredmatrix2015-05-271-0/+5
| * some work on issue #329redmatrix2015-05-251-2/+3
* | add rot47 to the mix. This shouldn't affect the speed to any measurable degree.redmatrix2015-05-191-6/+6
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph...redmatrix2015-05-191-9/+7
* | Merge branch 'master' into tresredmatrix2015-05-171-4/+5
|\ \
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-171-4/+5
| |\|
| | * missing $redmatrix2015-05-171-1/+1
| | * more work isolating the projectname from core.redmatrix2015-05-171-4/+4
* | | Merge branch 'master' into tresredmatrix2015-05-141-7/+22
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-101-1/+1
| |\|
| | * rev updateredmatrix2015-05-101-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-061-0/+15
| |\|
| | * turn consensus items into diaspora polls for that networkredmatrix2015-05-051-0/+15
| * | no need to obscure the diaspora signature if we're not obscuring the postsredmatrix2015-05-061-2/+2
| * | first pass name changeredmatrix2015-05-051-5/+5
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-108/+236
|\|
| * mod_connections ajax failure see http://stackoverflow.com/questions/14347611/...friendica2015-03-291-0/+51
| * catche edge case of tag "@abcdef +1", which tags the first entry in your aboo...friendica2015-03-241-3/+3
| * create terms for Diaspora mention tags - which in Diaspora are handled differ...friendica2015-03-131-3/+97
| * invoke tgroup_check() on diaspora posts/comments in case the recipient is a f...friendica2015-03-131-19/+34
| * don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
| * change default affinity (abook_closeness) to 80 for all new connections going...friendica2015-03-081-1/+7
| * Diaspora tag replacement was wretchedly buggy. Use our standard tag replaceme...friendica2015-02-191-129/+27
| * diaspora: move reshare encapsulation after tag parsing, since it seriously sc...friendica2015-02-191-13/+12
| * The Diaspora communications policies allow comments to public posts literally...friendica2015-02-171-17/+35
| * provide relief to sites that are severely impacted by the slow ITEM_UNSEEN se...friendica2015-02-121-2/+2
| * apply max_import_size to Diaspora postsfriendica2015-02-091-0/+43
* | Merge branch 'master' into tresfriendica2015-02-081-6/+4
|\|
| * generate the correct service permalinkfriendica2015-02-081-6/+4
* | Merge branch 'master' into tresfriendica2015-02-051-19/+36
|\|
| * over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
| * another issue with diaspora postings to sys channel - sys has no connections,...friendica2015-02-051-6/+14
| * diaspora public posts not delivering to sys channel if there were no other su...friendica2015-02-041-4/+9
* | Merge branch 'master' into tresfriendica2015-02-011-1/+1
|\|
| * issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
* | Merge branch 'master' into tresfriendica2015-01-291-22/+13
|\|
| * implement diaspora profile message (oops) or updated profile photos won't be ...friendica2015-01-291-21/+4
| * 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
* | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-261-1/+1
|\|
* | start on item_restrict conversionfriendica2015-01-221-6/+6
* | more expanding item flagsfriendica2015-01-221-1/+1
* | heavy lifting converting item flag bitsfriendica2015-01-221-2/+2
* | slow progress removing bitfields on item tablefriendica2015-01-211-11/+4
|/
* friendica commenters are currently shown using "Diaspora" app. Try and fix th...friendica2014-11-201-1/+6
* change logging of some troublesome or noisy bits so we can figure out what is...friendica2014-11-191-1/+1
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-131-11/+10
|\
| * logging changes, untranslated stringfriendica2014-11-051-1/+1
| * ok heads up - potentially destabilising change. I've tried to sort out all th...friendica2014-11-041-10/+9