| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 5 | -4/+16 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
| | |\ | |||||
| | * | | missed this one - it's required | redmatrix | 2015-08-20 | 5 | -4/+16 |
| | | | | |||||
| * | | | put tasklist into events page comanche layout | redmatrix | 2015-08-20 | 1 | -0/+3 |
| | | | | |||||
| * | | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 3 | -34/+44 |
| | | | | |||||
| * | | | more work on tasks | redmatrix | 2015-08-20 | 5 | -9/+71 |
| | | | | |||||
| * | | | We don't need photos to also include attachments. It's interesting, but not ↵ | redmatrix | 2015-08-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | all that useful. | ||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Another Spanish strings update | jeroenpraat | 2015-08-20 | 2 | -105/+105 |
| | |/ | |||||
| * | | some event related fixes and some base work for implementing native tasks ↵ | redmatrix | 2015-08-20 | 3 | -18/+100 |
| | | | | | | | | | (to-do lists); which should already be importable and exportable. | ||||
| * | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 2 | -24/+22 |
| | | | |||||
| * | | add carriage return to newlines for exported events (rfc2445:4.1) | redmatrix | 2015-08-20 | 1 | -31/+31 |
| | | | |||||
| * | | extra encoding on mail titles | redmatrix | 2015-08-20 | 2 | -2/+2 |
| | | | |||||
| * | | use consistent terminology | redmatrix | 2015-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | fix photo location | redmatrix | 2015-08-19 | 2 | -2/+13 |
| | | | |||||
| * | | check perms on ical attachments | redmatrix | 2015-08-19 | 1 | -3/+6 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-19 | 2 | -50/+72 |
| |\| | | | | | | | | | Conflicts: include/api.php | ||||
| | * | add photo_detail api call | redmatrix | 2015-08-18 | 1 | -68/+89 |
| | | | |||||
| | * | update to_do | redmatrix | 2015-08-18 | 1 | -0/+1 |
| | | | |||||
| * | | event integration improvements | redmatrix | 2015-08-19 | 4 | -3/+55 |
| | | | |||||
| * | | import and export tasks (calendar todo items) | redmatrix | 2015-08-18 | 1 | -5/+203 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-18 | 6 | -6/+20 |
| |\| | |||||
| | * | add event_sequence for vtodo's | redmatrix | 2015-08-18 | 5 | -5/+19 |
| | | | |||||
| | * | add month to export filename when using month | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -1/+1 |
| |\| | |||||
| | * | off by one | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 2 | -5/+21 |
| |\| | | | | | | | | | Conflicts: include/identity.php | ||||
| | * | provide ability to export by month as well as by year | redmatrix | 2015-08-17 | 2 | -4/+19 |
| | | | |||||
| * | | issues encountered whilst testing import_items module using yearly dump files | redmatrix | 2015-08-17 | 2 | -3/+2 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -0/+12 |
| |\| | |||||
| | * | add item_id to yearly dump files | redmatrix | 2015-08-17 | 1 | -0/+12 |
| | | | |||||
| * | | provide module for importing yearly content dumps | redmatrix | 2015-08-17 | 3 | -0/+199 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 6 | -302/+302 |
| |\| | | | | | | | | | Conflicts: view/nl/messages.po | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 3 | -329/+329 |
| | |\ | |||||
| | | * | Replaced Dutch po file by Spanish po file by accident. Had no visible impact. | jeroenpraat | 2015-08-17 | 1 | -2075/+2071 |
| | | | | |||||
| | | * | Final Spanish strings for now | jeroenpraat | 2015-08-17 | 2 | -297/+297 |
| | | | | |||||
| | | * | Fixed Spanish strings | jeroenpraat | 2015-08-17 | 1 | -2103/+2107 |
| | | | | |||||
| | * | | commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵ | redmatrix | 2015-08-17 | 4 | -5/+5 |
| | |/ | | | | | | | checkboxes from bulk edit checkboxes in the css | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 3 | -10/+15 |
| |\| | |||||
| | * | issue #386 - account and channel bulk edit checkboxes not visible and ↵ | redmatrix | 2015-08-16 | 3 | -10/+15 |
| | | | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 5 | -4/+37 |
| |\| | |||||
| | * | add DB support for tasks, todo items and repeating events | redmatrix | 2015-08-16 | 5 | -4/+37 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 5 | -23/+21 |
| |\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 3 | -31/+20 |
| | |\ | |||||
| | | * | 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 |
| | |\ | |||||
| | * | | revert 36b5f6ac | redmatrix | 2015-08-12 | 2 | -13/+15 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |