Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
|\ | ||||||
| * | 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 | |
| | | ||||||
* | | revert 36b5f6ac | redmatrix | 2015-08-12 | 2 | -13/+15 | |
|/ | ||||||
* | 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 | |
|\| | ||||||
| * | Update Dutch strings | jeroenpraat | 2015-08-09 | 2 | -12/+17 | |
| | | ||||||
* | | convert abook_flags from hubzilla during cloning | redmatrix | 2015-08-10 | 2 | -5/+31 | |
|/ | ||||||
* | ensure diaspora_signature is converted to json before we store it. | redmatrix | 2015-08-08 | 3 | -11/+18 | |
| | ||||||
* | closing tags | redmatrix | 2015-08-06 | 2 | -3/+3 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-05 | 2 | -1465/+1379 | |
|\ | ||||||
| * | Update Dutch strings | jeroenpraat | 2015-08-05 | 2 | -1465/+1379 | |
| | | ||||||
* | | connection filter fixes | redmatrix | 2015-08-05 | 2 | -7/+10 | |
|/ | ||||||
* | unobscure item before applying connection filter | redmatrix | 2015-08-04 | 2 | -1/+4 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-03 | 2 | -1354/+1266 | |
|\ | ||||||
| * | Merge pull request #382 from tuscanhobbit/master | Paolo T | 2015-08-03 | 2 | -1354/+1266 | |
| |\ | | | | | | | Italian translation | |||||
| | * | Italian translation | Paolo Tacconi | 2015-08-03 | 2 | -1354/+1266 | |
| | | | ||||||
* | | | these were some really difficult bugs to find | redmatrix | 2015-08-03 | 3 | -4/+3 | |
|/ / | ||||||
* | | revision update | redmatrix | 2015-08-02 | 1 | -1/+1 | |
| | | ||||||
* | | consistency of event form | redmatrix | 2015-07-31 | 4 | -213/+198 | |
| | | ||||||
* | | event parse cleanup | redmatrix | 2015-07-30 | 1 | -2/+8 | |
| | | ||||||
* | | escape $ in events | redmatrix | 2015-07-30 | 2 | -3/+16 | |
| | | ||||||
* | | dummy update | redmatrix | 2015-07-30 | 3 | -3/+8 | |
| | | ||||||
* | | minor cleanup | redmatrix | 2015-07-29 | 1 | -14/+1 | |
| | | ||||||
* | | Merge branch 'vobject' | redmatrix | 2015-07-29 | 1 | -23/+83 | |
|\ \ | | | | | | | | | | | | | Conflicts: include/event.php | |||||
| * | | convert ics import to sabre/vobject | redmatrix | 2015-07-29 | 1 | -29/+42 | |
| | | | ||||||
| * | | initial work on using sabre as a vcalendar parser | redmatrix | 2015-07-28 | 1 | -1/+50 | |
| | | | ||||||
* | | | add connection filter to non-zot posts | redmatrix | 2015-07-29 | 2 | -0/+8 | |
| | | | ||||||
* | | | PRIVACY: imported events | redmatrix | 2015-07-29 | 2 | -1/+2 | |
|/ / | ||||||
* | | make superblock block a channel if it's an owner as well as the current ↵ | redmatrix | 2015-07-28 | 3 | -3/+3 | |
| | | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant | |||||
* | | align buttons on event calendar | redmatrix | 2015-07-27 | 1 | -6/+5 | |
| | | ||||||
* | | logic issue in connection filter | redmatrix | 2015-07-27 | 2 | -5/+4 | |
| | | ||||||
* | | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 3 | -8/+54 | |
| | | ||||||
* | | backend code for importing events from "simple" ics calendar files. | redmatrix | 2015-07-26 | 1 | -0/+65 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-26 | 4 | -3171/+3325 | |
|\ \ | ||||||
| * | | comment out some popover infos - we provide enough visual feedback now | Mario Vavti | 2015-07-26 | 1 | -15/+15 | |
| | | | ||||||
| * | | Provide connection status if status is "a-normal" | Mario Vavti | 2015-07-26 | 2 | -0/+13 | |
| | | | ||||||
| * | | Merge pull request #378 from solstag/ptbrupdate | git-marijus | 2015-07-25 | 2 | -3156/+3297 | |
| |\ \ | | | | | | | | | update pt-br strings | |||||
| | * | | update pt-br strings | Alexandre Hannud Abdo | 2015-07-24 | 2 | -3156/+3297 | |
| |/ / | ||||||
* / / | revision and string update | redmatrix | 2015-07-26 | 2 | -30/+34 | |
|/ / | ||||||
* | | event privacy issue | redmatrix | 2015-07-23 | 1 | -2/+1 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-23 | 1 | -1/+1 | |
|\ \ |