aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add task widgetredmatrix2015-08-211-0/+5
|
* support ical priorityredmatrix2015-08-201-7/+19
|
* limit the height of tasklistredmatrix2015-08-201-0/+8
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-205-4/+16
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
| |\
| * | missed this one - it's requiredredmatrix2015-08-205-4/+16
| | |
* | | put tasklist into events page comanche layoutredmatrix2015-08-201-0/+3
| | |
* | | cleanup of task widget - make jquery workflow a bit smootherredmatrix2015-08-203-34/+44
| | |
* | | more work on tasksredmatrix2015-08-205-9/+71
| | |
* | | We don't need photos to also include attachments. It's interesting, but not ↵redmatrix2015-08-201-0/+1
| | | | | | | | | | | | all that useful.
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
|\ \ \ | | |/ | |/|
| * | Another Spanish strings updatejeroenpraat2015-08-202-105/+105
| |/
* | some event related fixes and some base work for implementing native tasks ↵redmatrix2015-08-203-18/+100
| | | | | | | | (to-do lists); which should already be importable and exportable.
* | do ical export before checking logged in channelredmatrix2015-08-202-24/+22
| |
* | add carriage return to newlines for exported events (rfc2445:4.1)redmatrix2015-08-201-31/+31
| |
* | extra encoding on mail titlesredmatrix2015-08-202-2/+2
| |
* | 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
|\| | | | | | | | | Conflicts: include/api.php
| * add photo_detail api callredmatrix2015-08-181-68/+89
| |
| * update to_doredmatrix2015-08-181-0/+1
| |
* | event integration improvementsredmatrix2015-08-194-3/+55
| |
* | 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
|\| | | | | | | | | Conflicts: include/identity.php
| * 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
|\| | | | | | | | | Conflicts: view/nl/messages.po
| * 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 ↵redmatrix2015-08-174-5/+5
| |/ | | | | | | checkboxes from bulk edit checkboxes in the css
* | 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
| | |