aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | * | 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
| | | |
| | * | 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
| | |\
| | * | 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 ↵redmatrix2015-08-131-0/+23
| | | | | | | | | | | | | | | | how it got to be this way. Here's the bird's eye view.
| * | | reverting 36b5f6acredmatrix2015-08-121-11/+18
| | | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1212-11288/+19624
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
| | * | 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
| |\| | | | | | | | | | | | | | | | Conflicts: doc/history.md mod/import.php
| | * 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
| | |\|
| | * | convert abook_flags from hubzilla during cloningredmatrix2015-08-102-5/+31
| | | |
| * | | more consistent output on forum widgetredmatrix2015-08-111-5/+27
| | | |
| * | | remove the forum limitredmatrix2015-08-112-2/+2
| | | |
| * | | arghhredmatrix2015-08-111-1/+1
| | | |
| * | | typoredmatrix2015-08-111-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 05:06:39 +0000