Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 3 | -31/+20 | |
| |\ | ||||||
| | * | Merge pull request #385 from solstag/commentperm | redmatrix | 2015-08-15 | 1 | -14/+3 | |
| | |\ | | | | | | | | | Actually work out comment perms in zot.php (badly attempted at 36b5f6ac) | |||||
| | | * | Properly fix which perms get checked for comments, Mike's solution | Alexandre Hannud Abdo | 2015-08-14 | 1 | -14/+3 | |
| | |/ | ||||||
| | * | update spanish | jeroenpraat | 2015-08-14 | 2 | -17/+17 | |
| | | | ||||||
| * | | set email verified if lost password workflow is completed to avoid the ↵ | redmatrix | 2015-08-14 | 3 | -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_merge | redmatrix | 2015-08-12 | 11 | -11288/+19619 | |
| |\ | ||||||
| * | | revert 36b5f6ac | redmatrix | 2015-08-12 | 2 | -13/+15 | |
| | | | ||||||
* | | | add item validation function | redmatrix | 2015-08-13 | 2 | -19/+34 | |
| | | | ||||||
* | | | attach_store needs a lot of documenting to understand what's going on and ↵ | redmatrix | 2015-08-13 | 1 | -0/+23 | |
| | | | | | | | | | | | | how it got to be this way. Here's the bird's eye view. | |||||
* | | | reverting 36b5f6ac | redmatrix | 2015-08-12 | 1 | -11/+18 | |
| | | | ||||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-12 | 12 | -11288/+19624 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl | |||||
| * | | Some corrections of Spanish strings. | jeroenpraat | 2015-08-12 | 2 | -135/+136 | |
| | | | ||||||
| * | | And Catalan! | jeroenpraat | 2015-08-12 | 2 | -6006/+9675 | |
| | | | ||||||
| * | | Thanks to Manuel. Updated Spanish to 100 procent. | jeroenpraat | 2015-08-12 | 9 | -5281/+9942 | |
| |/ | ||||||
* | | resolve conflict | redmatrix | 2015-08-11 | 1 | -56/+6 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 4 | -11/+72 | |
|\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | |||||
| * | doc fixes | redmatrix | 2015-08-11 | 2 | -9/+9 | |
| | | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -1/+11 | |
| |\ | ||||||
| | * | Merge pull request #383 from solstag/commentpermgood | redmatrix | 2015-08-12 | 1 | -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 Abdo | 2015-08-10 | 1 | -1/+11 | |
| | |/ | | | | | | | | | | using stream perms. | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-10 | 2 | -12/+17 | |
| |\| | ||||||
| * | | convert abook_flags from hubzilla during cloning | redmatrix | 2015-08-10 | 2 | -5/+31 | |
| | | | ||||||
* | | | more consistent output on forum widget | redmatrix | 2015-08-11 | 1 | -5/+27 | |
| | | | ||||||
* | | | remove the forum limit | redmatrix | 2015-08-11 | 2 | -2/+2 | |
| | | | ||||||
* | | | arghh | redmatrix | 2015-08-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | typo | redmatrix | 2015-08-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | wrong cid | redmatrix | 2015-08-11 | 1 | -2/+3 | |
| | | | ||||||
* | | | don't show '0' results, like notifications | redmatrix | 2015-08-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | order by name | redmatrix | 2015-08-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | make sure we only get forums attached to the channel | redmatrix | 2015-08-11 | 1 | -8/+2 | |
| | | | ||||||
* | | | set font-weight back to normal on forums widget | redmatrix | 2015-08-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 2 | -1/+2 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php | |||||
| * | | Update Dutch strings | jeroenpraat | 2015-08-09 | 2 | -12/+17 | |
| |/ | ||||||
| * | ensure diaspora_signature is converted to json before we store it. | redmatrix | 2015-08-08 | 3 | -11/+18 | |
| | | ||||||
* | | forum widget | redmatrix | 2015-08-11 | 2 | -4/+5 | |
| | | ||||||
* | | untested forum widget | redmatrix | 2015-08-11 | 1 | -1/+39 | |
| | | ||||||
* | | bring back colour to abook_self in acl | redmatrix | 2015-08-11 | 2 | -7/+7 | |
| | | ||||||
* | | private mail isues | redmatrix | 2015-08-09 | 2 | -6/+8 | |
| | | ||||||
* | | convert diaspora_signature to json for storage | redmatrix | 2015-08-08 | 1 | -0/+3 | |
| | | ||||||
* | | update | redmatrix | 2015-08-07 | 2 | -20/+5 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8 | redmatrix | 2015-08-06 | 2 | -3/+3 | |
|\| | ||||||
| * | closing tags | redmatrix | 2015-08-06 | 2 | -3/+3 | |
| | | ||||||
* | | more file permissions inheritance work | redmatrix | 2015-08-06 | 1 | -4/+11 | |
| | | ||||||
* | | photo permission inheritance. We want to use the folder permissions unless ↵ | redmatrix | 2015-08-06 | 6 | -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 ↵ | redmatrix | 2015-08-05 | 1 | -20/+31 | |
| | | | | | | | | them with dav | |||||
* | | don't throw errors or do the wrong thing if photos have no album (placed on ↵ | redmatrix | 2015-08-05 | 2 | -9/+14 | |
| | | | | | | | | your dav rootdir) | |||||
* | | photo album is decided in dav or attach modules now - don't set it in ↵ | redmatrix | 2015-08-05 | 1 | -8/+8 | |
| | | | | | | | | photos_upload | |||||
* | | uploaded photo from dav (file put, not dav create) not showing in photo album | redmatrix | 2015-08-05 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-05 | 2 | -7/+10 | |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-05 | 2 | -1465/+1379 | |
| |\ |