aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-315-272/+283
|\
| * Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵jeroenpraat2015-08-293-56/+55
| | | | | | | | update strings ES
| * Update es and nl stringsjeroenpraat2015-08-284-245/+257
| |
* | change the likes db structure to make it more easily importable/exportableredmatrix2015-08-318-258/+282
|/
* fallback directory server list updateredmatrix2015-08-272-2/+2
|
* use extended export format for items in api photo_detailredmatrix2015-08-261-1/+1
|
* add item info to photo detail in apiredmatrix2015-08-261-1/+21
|
* support likes on comments with diaspora owner by sending as activityredmatrix2015-08-261-14/+19
|
* required for future workredmatrix2015-08-261-1/+12
|
* syntax error in last checkinredmatrix2015-08-261-4/+4
|
* import fixesredmatrix2015-08-262-2/+34
|
* remove orphan mod_connections editing code (now done in mod/connedit)redmatrix2015-08-244-144/+13
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-232-743/+743
|\
| * Final (temporary I suppose) Spanish string updatejeroenpraat2015-08-222-743/+743
| |
* | issues with abook sync between hubzilla and redredmatrix2015-08-234-87/+92
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
|\
| * Another Spanish strings updatejeroenpraat2015-08-202-105/+105
| |
* | missed this one - it's requiredredmatrix2015-08-205-4/+16
|/
* add photo_detail api callredmatrix2015-08-181-68/+89
|
* update to_doredmatrix2015-08-181-0/+1
|
* add event_sequence for vtodo'sredmatrix2015-08-185-5/+19
|
* add month to export filename when using monthredmatrix2015-08-171-1/+1
|
* off by oneredmatrix2015-08-171-1/+1
|
* provide ability to export by month as well as by yearredmatrix2015-08-172-4/+19
|
* add item_id to yearly dump filesredmatrix2015-08-171-0/+12
|
* 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
* 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.
* add DB support for tasks, todo items and repeating eventsredmatrix2015-08-165-4/+37
|
* 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
|\
| * 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
| |
* | revert 36b5f6acredmatrix2015-08-122-13/+15
|/
* 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
|\|
| * Update Dutch stringsjeroenpraat2015-08-092-12/+17
| |
* | convert abook_flags from hubzilla during cloningredmatrix2015-08-102-5/+31
|/
* ensure diaspora_signature is converted to json before we store it.redmatrix2015-08-083-11/+18
|