Commit Graph
13929 Commits
Author SHA1 Message Date
redmatrix 0d2c90cc2e add item info to photo detail in api 2015-08-26 22:11:50 -07:00
redmatrix d1c23477df support likes on comments with diaspora owner by sending as activity 2015-08-26 20:20:41 -07:00
redmatrix 8fb1356623 required for future work 2015-08-26 17:49:57 -07:00
redmatrix 71308fe8c1 syntax error in last checkin 2015-08-26 13:50:51 -07:00
redmatrix da649e397e import fixes 2015-08-26 13:49:07 -07:00
redmatrix 250d286f1d remove orphan mod_connections editing code (now done in mod/connedit) 2015-08-24 01:28:13 -07:00
redmatrix 852d19f209 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-23 17:41:23 -07:00
redmatrix b1f091e4d7 issues with abook sync between hubzilla and red 2015-08-23 17:40:47 -07:00
jeroenpraat 957abf1c1b Final (temporary I suppose) Spanish string update 2015-08-22 16:29:34 +02:00
redmatrix 72bdca009c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 22:14:03 -07:00
redmatrix fef93af0a6 missed this one - it's required 2015-08-20 22:13:25 -07:00
jeroenpraat 20fc4ee021 Another Spanish strings update 2015-08-20 20:57:08 +02:00
redmatrix c96f121d41 add photo_detail api call 2015-08-18 22:14:16 -07:00
redmatrix 72b7b19937 update to_do 2015-08-18 20:00:11 -07:00
redmatrix 37d07a7d2a add event_sequence for vtodo's 2015-08-18 17:10:40 -07:00
redmatrix 75fbf21e6b add month to export filename when using month 2015-08-17 22:27:41 -07:00
redmatrix 9f4f967ead off by one 2015-08-17 22:25:17 -07:00
redmatrix f682325924 provide ability to export by month as well as by year 2015-08-17 22:20:10 -07:00
redmatrix 1982fc807f add item_id to yearly dump files 2015-08-17 21:38:43 -07:00
redmatrix 4ebee195cc Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 16:12:35 -07:00
redmatrix 98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css 2015-08-17 16:11:10 -07:00
jeroenpraat f2fdc91ad5 Replaced Dutch po file by Spanish po file by accident. Had no visible impact. 2015-08-17 22:27:33 +02:00
jeroenpraat d88c25c982 Final Spanish strings for now 2015-08-17 22:21:55 +02:00
jeroenpraat f70fd95361 Fixed Spanish strings 2015-08-17 13:38:43 +02:00
redmatrix 631eb4b2c2 issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation. 2015-08-16 19:52:25 -07:00
redmatrix b3b566c907 add DB support for tasks, todo items and repeating events 2015-08-16 17:17:34 -07:00
redmatrix 1d4dc7e27c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-14 22:20:44 -07:00
redmatrix 0d84c77c6c set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost. 2015-08-14 22:19:15 -07:00
redmatrix 400eb748eb Merge pull request #385 from solstag/commentperm
Actually work out comment perms in zot.php (badly attempted at 36b5f6ac)
2015-08-15 10:08:26 +10:00
Alexandre Hannud Abdo 73b30de9cb Properly fix which perms get checked for comments, Mike's solution 2015-08-14 12:21:05 -03:00
jeroenpraat 7a8d0a03f6 update spanish 2015-08-14 15:57:05 +02:00
redmatrix 98f3242e73 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-12 22:38:08 -07:00
redmatrix 0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
jeroenpraat 3099562a21 Some corrections of Spanish strings. 2015-08-12 20:52:46 +02:00
jeroenpraat 588d22974c And Catalan! 2015-08-12 15:16:56 +02:00
jeroenpraat 4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. 2015-08-12 15:11:04 +02:00
redmatrix d882b3274b doc fixes 2015-08-11 22:32:53 -07:00
redmatrix 1aa48ddfaa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-11 22:32:33 -07:00
redmatrix ad02d5589d Merge pull request #383 from solstag/commentpermgood
Require comment perms only for own posts, allow senders to deliver co…
2015-08-12 15:31:36 +10:00
redmatrix f30d2b489a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-10 16:17:06 -07:00
redmatrix 81c740178d convert abook_flags from hubzilla during cloning 2015-08-10 16:16:26 -07:00
Alexandre Hannud Abdo 36b5f6acfe Require comment perms only for own posts, allow senders to deliver comments using stream perms. 2015-08-10 18:20:18 -03:00
jeroenpraat eae88b0815 Update Dutch strings 2015-08-09 15:56:02 +02:00
redmatrix 2656aeaf9c ensure diaspora_signature is converted to json before we store it. 2015-08-08 15:18:34 -07:00
redmatrix ec5d91d8cf closing tags 2015-08-06 21:07:25 -07:00
redmatrix efa589300a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-05 16:12:30 -07:00
redmatrix 6413ba3230 connection filter fixes 2015-08-05 16:12:05 -07:00
jeroenpraat 510cb5df86 Update Dutch strings 2015-08-05 22:31:40 +02:00
redmatrix a61fc00fa4 unobscure item before applying connection filter 2015-08-04 15:59:18 -07:00
redmatrix 56045093cc Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-03 21:13:54 -07:00