aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-041-0/+3
|\
| * unobscure item before applying connection filterredmatrix2015-08-041-0/+3
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-032-2/+3
|\|
| * these were some really difficult bugs to findredmatrix2015-08-032-3/+2
* | more work separating Diaspora from coreredmatrix2015-08-032-19/+13
* | diaspora_meta getting double json encodedredmatrix2015-08-021-1/+1
* | begin moving diaspora to pluginredmatrix2015-08-022-3039/+8
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-312-3/+22
|\|
| * event parse cleanupredmatrix2015-07-301-2/+8
| * escape $ in eventsredmatrix2015-07-302-3/+16
* | undefined functionredmatrix2015-07-301-0/+1
* | minor - add all the newly supported table columnsredmatrix2015-07-301-2/+2
* | incorrect photo permissions when uploaded via /cloud; issue #21redmatrix2015-07-301-0/+11
* | make /cloud work again after all the shuffling this morningredmatrix2015-07-303-9/+14
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-307-87/+125
|\|
| * minor cleanupredmatrix2015-07-291-14/+1
| * Merge branch 'vobject'redmatrix2015-07-291-23/+83
| |\
| | * convert ics import to sabre/vobjectredmatrix2015-07-291-29/+42
| | * initial work on using sabre as a vcalendar parserredmatrix2015-07-281-1/+50
| * | add connection filter to non-zot postsredmatrix2015-07-292-0/+8
| * | PRIVACY: imported eventsredmatrix2015-07-291-0/+1
| |/
| * make superblock block a channel if it's an owner as well as the current autho...redmatrix2015-07-282-2/+2
* | incorrect function nameredmatrix2015-07-292-2/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-272-5/+88
|\|
| * logic issue in connection filterredmatrix2015-07-271-4/+3
| * crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-261-6/+25
| * backend code for importing events from "simple" ics calendar files.redmatrix2015-07-261-0/+65
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-233-2/+8
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-231-1/+1
| |\
| | * make content filter by language work for excludeszottel2015-07-221-1/+1
| * | patch to allow theme based widgetsredmatrix2015-07-233-2/+7
| |/
* | refresh diaspora xchan every month or so since receiving profile update messa...redmatrix2015-07-223-4/+36
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-215-8/+17
|\|
| * ics calendar export - commas need to be escapedredmatrix2015-07-211-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-203-8/+8
| |\
| | * Fixes regarding the new default profile photo size. The default profile photo...Mario Vavti2015-07-203-8/+8
| * | there is no stricmp() in php, use strcasecmp() - also only detect language if...redmatrix2015-07-201-3/+6
| |/
| * allow per-connection content filter to specify a detected language to include...redmatrix2015-07-201-0/+6
* | silence warning about non array diaspora_meta but report it in the logs so we...redmatrix2015-07-191-1/+3
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-193-6/+6
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-161-5/+5
| |\
| | * fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143c...Mario Vavti2015-07-161-5/+5
| * | provide a way to export a single year of items (to potentially keep from exha...redmatrix2015-07-161-1/+30
| |/
| * allow plugins to provide module handlers for arbitrary modules that haven't b...redmatrix2015-07-151-0/+2
* | typoredmatrix2015-07-191-1/+1
* | the view_photos and post_photos permissions are redundant and are now mapped ...redmatrix2015-07-194-56/+30
* | some photo/attach permissions issuesredmatrix2015-07-181-12/+22
* | provide any single year of exported itemsredmatrix2015-07-162-3/+35
* | abook clone sync - change logic to also unset existing cross-project flags be...redmatrix2015-07-161-16/+8
* | don't including rating stuff from cloned abooksredmatrix2015-07-161-1/+1