aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * 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
| |
* | revert 36b5f6acredmatrix2015-08-122-13/+15
|/
* 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
|\|
| * Update Dutch stringsjeroenpraat2015-08-092-12/+17
| |
* | convert abook_flags from hubzilla during cloningredmatrix2015-08-102-5/+31
|/
* ensure diaspora_signature is converted to json before we store it.redmatrix2015-08-083-11/+18
|
* closing tagsredmatrix2015-08-062-3/+3
|
* 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
|/
* unobscure item before applying connection filterredmatrix2015-08-042-1/+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 translation
| | * Italian translationPaolo Tacconi2015-08-032-1354/+1266
| | |
* | | these were some really difficult bugs to findredmatrix2015-08-033-4/+3
|/ /
* | revision updateredmatrix2015-08-021-1/+1
| |
* | consistency of event formredmatrix2015-07-314-213/+198
| |
* | event parse cleanupredmatrix2015-07-301-2/+8
| |
* | escape $ in eventsredmatrix2015-07-302-3/+16
| |
* | dummy updateredmatrix2015-07-303-3/+8
| |
* | minor cleanupredmatrix2015-07-291-14/+1
| |
* | Merge branch 'vobject'redmatrix2015-07-291-23/+83
|\ \ | | | | | | | | | | | | Conflicts: include/event.php
| * | convert ics import to sabre/vobjectredmatrix2015-07-291-29/+42
| | |
| * | initial work on using sabre as a vcalendar parserredmatrix2015-07-281-1/+50
| | |
* | | add connection filter to non-zot postsredmatrix2015-07-292-0/+8
| | |
* | | PRIVACY: imported eventsredmatrix2015-07-292-1/+2
|/ /
* | make superblock block a channel if it's an owner as well as the current ↵redmatrix2015-07-283-3/+3
| | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* | align buttons on event calendarredmatrix2015-07-271-6/+5
| |
* | logic issue in connection filterredmatrix2015-07-272-5/+4
| |
* | crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-263-8/+54
| |
* | backend code for importing events from "simple" ics calendar files.redmatrix2015-07-261-0/+65
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-264-3171/+3325
|\ \
| * | comment out some popover infos - we provide enough visual feedback nowMario Vavti2015-07-261-15/+15
| | |
| * | Provide connection status if status is "a-normal"Mario Vavti2015-07-262-0/+13
| | |
| * | Merge pull request #378 from solstag/ptbrupdategit-marijus2015-07-252-3156/+3297
| |\ \ | | | | | | | | update pt-br strings
| | * | update pt-br stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
| |/ /
* / / revision and string updateredmatrix2015-07-262-30/+34
|/ /
* | event privacy issueredmatrix2015-07-231-2/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-231-1/+1
|\ \
| * \ Merge pull request #377 from zzottel/masterredmatrix2015-07-221-1/+1
| |\ \ | | | | | | | | make content filter by language work for excludes
| | * | make content filter by language work for excludeszottel2015-07-221-1/+1
| |/ /
* / / patch to allow theme based widgetsredmatrix2015-07-235-4/+8
|/ /