aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | use consistent terminologyredmatrix2015-08-191-1/+1
| * | fix photo locationredmatrix2015-08-192-2/+13
| * | check perms on ical attachmentsredmatrix2015-08-191-3/+6
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-192-50/+72
| |\|
| | * add photo_detail api callredmatrix2015-08-181-68/+89
| | * update to_doredmatrix2015-08-181-0/+1
| * | event integration improvementsredmatrix2015-08-194-3/+55
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-1945-11403/+20389
|\| |
| * | import and export tasks (calendar todo items)redmatrix2015-08-181-5/+203
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-186-6/+20
| |\|
| | * add event_sequence for vtodo'sredmatrix2015-08-185-5/+19
| | * add month to export filename when using monthredmatrix2015-08-171-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-1/+1
| |\|
| | * off by oneredmatrix2015-08-171-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-172-5/+21
| |\|
| | * provide ability to export by month as well as by yearredmatrix2015-08-172-4/+19
| * | issues encountered whilst testing import_items module using yearly dump filesredmatrix2015-08-172-3/+2
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-0/+12
| |\|
| | * add item_id to yearly dump filesredmatrix2015-08-171-0/+12
| * | provide module for importing yearly content dumpsredmatrix2015-08-173-0/+199
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-176-302/+302
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-173-329/+329
| | |\
| | | * Replaced Dutch po file by Spanish po file by accident. Had no visible impact.jeroenpraat2015-08-171-2075/+2071
| | | * Final Spanish strings for nowjeroenpraat2015-08-172-297/+297
| | | * Fixed Spanish stringsjeroenpraat2015-08-171-2103/+2107
| | * | commit 631eb4b broke the checkboxes in admin/site, so separate normal checkbo...redmatrix2015-08-174-5/+5
| | |/
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-163-10/+15
| |\|
| | * issue #386 - account and channel bulk edit checkboxes not visible and therefo...redmatrix2015-08-163-10/+15
| * | 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
| |\|
| | * 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
| | | |\