aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | issues with abook sync between hubzilla and redredmatrix2015-08-234-87/+92
| | |/
| * | provide a comment_policy of "network: diaspora" to handle their special case ↵redmatrix2015-08-231-0/+2
| | | | | | | | | | | | public-posts-are-commentable-by-anybody permission without breaking any other permissions.
| * | sync abook flags in memory after altering themredmatrix2015-08-232-3/+11
| | |
| * | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵redmatrix2015-08-232-4/+4
| | | | | | | | | | | | hub sync
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-08-2333-238/+532
|\| |
| * | change name of moduleredmatrix2015-08-226-11/+13
| | |
| * | increase width of tasklist input elementredmatrix2015-08-221-1/+5
| | |
| * | restrict event notification to events and birthdays (exclude tasks)redmatrix2015-08-221-0/+2
| | |
| * | add load_pdl hook for pluginsredmatrix2015-08-222-1/+6
| | |
| * | 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
| | |
* | | 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
| |\| | | | | | | | | | | | | 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
| | | |