aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-163-10/+15
|\
| * issue #386 - account and channel bulk edit checkboxes not visible and ↵redmatrix2015-08-163-10/+15
| | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-165-4/+37
|\|
| * 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
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-143-31/+20
| |\
| | * Merge pull request #385 from solstag/commentpermredmatrix2015-08-151-14/+3
| | |\ | | | | | | | | Actually work out comment perms in zot.php (badly attempted at 36b5f6ac)
| | | * 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 ↵redmatrix2015-08-143-36/+37
| |/ | | | | | | situation where they can reset the password but still not be able to login because the original email verification was lost.
| * 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 ↵redmatrix2015-08-131-0/+23
| | | | | | | | | | | | how it got to be this way. Here's the bird's eye view.
* | | reverting 36b5f6acredmatrix2015-08-121-11/+18
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1212-11288/+19624
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
| * | 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
|\| | | | | | | | | | | Conflicts: doc/history.md mod/import.php
| * 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 co…
| | | * Require comment perms only for own posts, allow senders to deliver comments ↵Alexandre Hannud Abdo2015-08-101-1/+11
| | |/ | | | | | | | | | using stream perms.
| * | 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
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
| * | 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 ↵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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 10:40:03 +0000