aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * add DB support for tasks, todo items and repeating eventsredmatrix2015-08-165-4/+37
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-145-23/+21
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-143-31/+20
| | |\
| | | * Merge pull request #385 from solstag/commentpermredmatrix2015-08-151-14/+3
| | | |\
| | | | * Properly fix which perms get checked for comments, Mike's solutionAlexandre Hannud Abdo2015-08-141-14/+3
| | | |/
| | | * update spanishjeroenpraat2015-08-142-17/+17
| | * | set email verified if lost password workflow is completed to avoid the situat...redmatrix2015-08-143-36/+37
| | |/
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1211-11288/+19619
| | |\
| | * | revert 36b5f6acredmatrix2015-08-122-13/+15
| * | | add item validation functionredmatrix2015-08-132-19/+34
| * | | attach_store needs a lot of documenting to understand what's going on and how...redmatrix2015-08-131-0/+23
| * | | reverting 36b5f6acredmatrix2015-08-121-11/+18
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1212-11288/+19624
| |\ \ \ | | | |/ | | |/|
| | * | Some corrections of Spanish strings.jeroenpraat2015-08-122-135/+136
| | * | And Catalan!jeroenpraat2015-08-122-6006/+9675
| | * | Thanks to Manuel. Updated Spanish to 100 procent.jeroenpraat2015-08-129-5281/+9942
| | |/
| * | resolve conflictredmatrix2015-08-111-56/+6
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-114-11/+72
| |\|
| | * doc fixesredmatrix2015-08-112-9/+9
| | * 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
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-0613-117/+114
|\| |
| * | 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