aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bring back colour to abook_self in aclredmatrix2015-08-112-7/+7
|
* private mail isuesredmatrix2015-08-092-6/+8
|
* convert diaspora_signature to json for storageredmatrix2015-08-081-0/+3
|
* updateredmatrix2015-08-072-20/+5
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8redmatrix2015-08-062-3/+3
|\
| * closing tagsredmatrix2015-08-062-3/+3
| |
* | more file permissions inheritance workredmatrix2015-08-061-4/+11
| |
* | photo permission inheritance. We want to use the folder permissions unless ↵redmatrix2015-08-066-24/+90
| | | | | | | | 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.
* | prohibit some photo album edit operations until we figure out how to sync ↵redmatrix2015-08-051-20/+31
| | | | | | | | them with dav
* | don't throw errors or do the wrong thing if photos have no album (placed on ↵redmatrix2015-08-052-9/+14
| | | | | | | | 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-052-7/+10
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-052-1465/+1379
| |\
| | * Update Dutch stringsjeroenpraat2015-08-052-1465/+1379
| | |
| * | connection filter fixesredmatrix2015-08-052-7/+10
| |/
* | personal oembed black/white listredmatrix2015-08-042-0/+30
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-042-1/+4
|\|
| * unobscure item before applying connection filterredmatrix2015-08-042-1/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-033-3/+4
|\| | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-032-1354/+1266
| |\
| | * Merge pull request #382 from tuscanhobbit/masterPaolo T2015-08-032-1354/+1266
| | |\ | | | | | | | | Italian translation
| | | * Italian translationPaolo Tacconi2015-08-032-1354/+1266
| | | |
| * | | these were some really difficult bugs to findredmatrix2015-08-033-4/+3
| |/ /
* | | more work separating Diaspora from coreredmatrix2015-08-036-70/+14
| | |
* | | diaspora_meta getting double json encodedredmatrix2015-08-021-1/+1
| | |
* | | begin moving diaspora to pluginredmatrix2015-08-024-3166/+8
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-08-021-1/+1
|\| |
| * | revision updateredmatrix2015-08-021-1/+1
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-315-6/+25
|\| | | | | | | | | | | | | | Conflicts: util/messages.po
| * | consistency of event formredmatrix2015-07-314-213/+198
| | |
| * | 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
| | |
* | | update some of the old attach.flag values to the new schemaredmatrix2015-07-301-1/+16
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-303-3/+8
|\| |
| * | dummy updateredmatrix2015-07-303-3/+8
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-309-91/+129
|\| | | | | | | | | | | | | | | | | 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-292-1/+2
| |/ /
| * | make superblock block a channel if it's an owner as well as the current ↵redmatrix2015-07-283-3/+3
| | | | | | | | | | | | 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-271-6/+5
|\| |