aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* wrong cidredmatrix2015-08-111-2/+3
|
* don't show '0' results, like notificationsredmatrix2015-08-111-1/+1
|
* order by nameredmatrix2015-08-111-1/+1
|
* make sure we only get forums attached to the channelredmatrix2015-08-111-8/+2
|
* set font-weight back to normal on forums widgetredmatrix2015-08-111-1/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-111-0/+1
|\ | | | | | | | | | | | | | | Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
| * ensure diaspora_signature is converted to json before we store it.redmatrix2015-08-081-0/+3
| |
* | forum widgetredmatrix2015-08-111-4/+4
| |
* | untested forum widgetredmatrix2015-08-111-1/+39
| |
* | private mail isuesredmatrix2015-08-092-6/+8
| |
* | convert diaspora_signature to json for storageredmatrix2015-08-081-0/+3
| |
* | more file permissions inheritance workredmatrix2015-08-061-4/+11
| |
* | photo permission inheritance. We want to use the folder permissions unless ↵redmatrix2015-08-065-24/+73
| | | | | | | | specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
* | don't throw errors or do the wrong thing if photos have no album (placed on ↵redmatrix2015-08-051-1/+1
| | | | | | | | your dav rootdir)
* | photo album is decided in dav or attach modules now - don't set it in ↵redmatrix2015-08-051-8/+8
| | | | | | | | photos_upload
* | uploaded photo from dav (file put, not dav create) not showing in photo albumredmatrix2015-08-051-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-051-6/+9
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * connection filter fixesredmatrix2015-08-051-6/+9
| |
* | personal oembed black/white listredmatrix2015-08-042-0/+30
| |
* | 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
|\| | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php
| * 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
|\| | | | | | | | | Conflicts: util/messages.po
| * 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
|\| | | | | | | | | | | several dav fixes Conflicts: include/items.php
| * minor cleanupredmatrix2015-07-291-14/+1
| |
| * Merge branch 'vobject'redmatrix2015-07-291-23/+83
| |\ | | | | | | | | | | | | Conflicts: include/event.php
| | * 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 ↵redmatrix2015-07-282-2/+2
| | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* | incorrect function nameredmatrix2015-07-292-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-272-5/+88
|\| | | | | | | | | Conflicts: util/messages.po
| * 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
|\| | | | | | | | | Conflicts: include/diaspora.php
| * 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
| |/