aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-111-1/+11
| |\
| | * Merge pull request #383 from solstag/commentpermgoodredmatrix2015-08-121-1/+11
| | |\
| | | * Require comment perms only for own posts, allow senders to deliver comments u...Alexandre Hannud Abdo2015-08-101-1/+11
| | |/
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-102-12/+17
| |\|
| * | convert abook_flags from hubzilla during cloningredmatrix2015-08-102-5/+31
* | | more consistent output on forum widgetredmatrix2015-08-111-5/+27
* | | remove the forum limitredmatrix2015-08-112-2/+2
* | | arghhredmatrix2015-08-111-1/+1
* | | typoredmatrix2015-08-111-1/+1
* | | 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-112-1/+2
|\ \ \ | | |/ | |/|
| * | Update Dutch stringsjeroenpraat2015-08-092-12/+17
| |/
| * ensure diaspora_signature is converted to json before we store it.redmatrix2015-08-083-11/+18
* | forum widgetredmatrix2015-08-112-4/+5
* | untested forum widgetredmatrix2015-08-111-1/+39
* | 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 sp...redmatrix2015-08-066-24/+90
* | prohibit some photo album edit operations until we figure out how to sync the...redmatrix2015-08-051-20/+31
* | don't throw errors or do the wrong thing if photos have no album (placed on y...redmatrix2015-08-052-9/+14
* | photo album is decided in dav or attach modules now - don't set it in photos_...redmatrix2015-08-051-8/+8
* | 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
|\|
| * 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
|\|
| * 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 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
|\| |
| * | consistency of event formredmatrix2015-07-314-213/+198