Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 69920fb717 fix photo location redmatrix 2015-08-19 19:17:17 -07:00
• 863a979754 check perms on ical attachments redmatrix 2015-08-19 17:16:19 -07:00
• 8d66fbccfa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-19 16:54:12 -07:00
• a4caaefd32 event integration improvements redmatrix 2015-08-19 16:50:32 -07:00
• e50e687191 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-08-19 19:40:18 +02:00
• c96f121d41 add photo_detail api call redmatrix 2015-08-18 22:14:16 -07:00
• 72b7b19937 update to_do redmatrix 2015-08-18 20:00:11 -07:00
• 4e3d295c90 import and export tasks (calendar todo items) redmatrix 2015-08-18 19:06:50 -07:00
• 3b1554db2e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-18 17:15:53 -07:00
• 37d07a7d2a add event_sequence for vtodo's redmatrix 2015-08-18 17:10:40 -07:00
• 75fbf21e6b add month to export filename when using month redmatrix 2015-08-17 22:27:41 -07:00
• 27b61b1456 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-17 22:25:47 -07:00
• 9f4f967ead off by one redmatrix 2015-08-17 22:25:17 -07:00
• 9763c46b7e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-17 22:23:23 -07:00
• f682325924 provide ability to export by month as well as by year redmatrix 2015-08-17 22:20:10 -07:00
• abe362bdd4 issues encountered whilst testing import_items module using yearly dump files redmatrix 2015-08-17 21:56:55 -07:00
• ea331b043c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-17 21:41:14 -07:00
• 1a4a921528 provide module for importing yearly content dumps redmatrix 2015-08-17 21:40:40 -07:00
• 1982fc807f add item_id to yearly dump files redmatrix 2015-08-17 21:38:43 -07:00
• 30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-17 16:14:15 -07:00
• 4ebee195cc Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-17 16:12:35 -07:00
• 98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css redmatrix 2015-08-17 16:11:10 -07:00
• f2fdc91ad5 Replaced Dutch po file by Spanish po file by accident. Had no visible impact. jeroenpraat 2015-08-17 22:27:33 +02:00
• d88c25c982 Final Spanish strings for now jeroenpraat 2015-08-17 22:21:55 +02:00
• f70fd95361 Fixed Spanish strings jeroenpraat 2015-08-17 13:38:43 +02:00
• be3a272a80 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-16 19:54:38 -07:00
• 631eb4b2c2 issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation. redmatrix 2015-08-16 19:52:25 -07:00
• 6a1d1867f0 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-16 19:13:29 -07:00
• b3b566c907 add DB support for tasks, todo items and repeating events redmatrix 2015-08-16 17:17:34 -07:00
• dd5023e494 Updating logo icon in Readme file and change markup heading for universality. Andrew Manning 2015-08-15 12:49:56 -04:00
• 18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-14 22:24:15 -07:00
• 1d4dc7e27c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-14 22:20:44 -07:00
• 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. redmatrix 2015-08-14 22:19:15 -07:00
• 400eb748eb Merge pull request #385 from solstag/commentperm redmatrix 2015-08-15 10:08:26 +10:00
• 73b30de9cb Properly fix which perms get checked for comments, Mike's solution Alexandre Hannud Abdo 2015-08-14 12:21:05 -03:00
• 7a8d0a03f6 update spanish jeroenpraat 2015-08-14 15:57:05 +02:00
• d140620008 add item validation function redmatrix 2015-08-13 19:35:57 -07:00
• 50a1e0c618 attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view. redmatrix 2015-08-13 17:11:59 -07:00
• ef73880459 reverting 36b5f6ac redmatrix 2015-08-12 22:48:08 -07:00
• 98f3242e73 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-12 22:38:08 -07:00
• 0b7365e2db revert 36b5f6ac redmatrix 2015-08-12 22:37:24 -07:00
• f88dc84091 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-12 20:36:32 -07:00
• 3099562a21 Some corrections of Spanish strings. jeroenpraat 2015-08-12 20:52:46 +02:00
• 588d22974c And Catalan! jeroenpraat 2015-08-12 15:16:56 +02:00
• 4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. jeroenpraat 2015-08-12 15:11:04 +02:00
• b634c08d0e resolve conflict redmatrix 2015-08-11 22:41:27 -07:00
• 2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-11 22:35:36 -07:00
• d882b3274b doc fixes redmatrix 2015-08-11 22:32:53 -07:00
• 1aa48ddfaa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-11 22:32:33 -07:00
• ad02d5589d Merge pull request #383 from solstag/commentpermgood redmatrix 2015-08-12 15:31:36 +10:00
• 0e8991fec2 more consistent output on forum widget redmatrix 2015-08-11 22:23:20 -07:00
• b651604e8b remove the forum limit redmatrix 2015-08-11 20:58:03 -07:00
• 1932e72603 arghh redmatrix 2015-08-11 20:25:52 -07:00
• be4eb4eeb8 typo redmatrix 2015-08-11 20:25:02 -07:00
• 89fa36ce2a wrong cid redmatrix 2015-08-11 20:24:06 -07:00
• 80df97e734 don't show '0' results, like notifications redmatrix 2015-08-11 20:18:34 -07:00
• 8dd7fab38d order by name redmatrix 2015-08-11 20:16:17 -07:00
• 400d5790f3 make sure we only get forums attached to the channel redmatrix 2015-08-11 19:58:31 -07:00
• c8e83d6edc set font-weight back to normal on forums widget redmatrix 2015-08-11 19:27:22 -07:00
• c8b8c6cb14 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-11 19:24:31 -07:00
• 44dcbeaaa4 forum widget redmatrix 2015-08-11 19:22:14 -07:00
• 0c23843b61 untested forum widget redmatrix 2015-08-11 17:39:29 -07:00
• 0a34b96e11 bring back colour to abook_self in acl redmatrix 2015-08-11 01:16:04 -07:00
• f30d2b489a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-10 16:17:06 -07:00
• 81c740178d convert abook_flags from hubzilla during cloning redmatrix 2015-08-10 16:16:26 -07:00
• 36b5f6acfe Require comment perms only for own posts, allow senders to deliver comments using stream perms. Alexandre Hannud Abdo 2015-07-17 18:36:44 -03:00
• eae88b0815 Update Dutch strings jeroenpraat 2015-08-09 15:56:02 +02:00
• 58c9f516b3 private mail isues redmatrix 2015-08-09 01:18:36 -07:00
• 8ce4814835 convert diaspora_signature to json for storage redmatrix 2015-08-08 15:19:50 -07:00
• 2656aeaf9c ensure diaspora_signature is converted to json before we store it. redmatrix 2015-08-08 15:18:34 -07:00
• bf3ea2cd47 update redmatrix 2015-08-07 14:20:18 -07:00
• bd03603f58 Merge branch 'master' of https://github.com/redmatrix/redmatrix 0.8 redmatrix 2015-08-06 21:08:33 -07:00
• ec5d91d8cf closing tags redmatrix 2015-08-06 21:07:25 -07:00
• 7e43da43a1 more file permissions inheritance work redmatrix 2015-08-06 17:42:53 -07:00
• 91bbfcf554 photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. redmatrix 2015-08-06 17:09:09 -07:00
• 07cd0c870f Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-08-06 23:57:28 +02:00
• 1b0cb9388c prohibit some photo album edit operations until we figure out how to sync them with dav redmatrix 2015-08-05 22:35:42 -07:00
• 880dec5a4e don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir) redmatrix 2015-08-05 22:07:51 -07:00
• dfb8a1b2d4 photo album is decided in dav or attach modules now - don't set it in photos_upload redmatrix 2015-08-05 21:42:00 -07:00
• cb8f0a0e0f uploaded photo from dav (file put, not dav create) not showing in photo album redmatrix 2015-08-05 20:54:32 -07:00
• 03a833f2f8 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-08-05 16:13:42 -07:00
• efa589300a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-05 16:12:30 -07:00
• 6413ba3230 connection filter fixes redmatrix 2015-08-05 16:12:05 -07:00
• 510cb5df86 Update Dutch strings jeroenpraat 2015-08-05 22:31:40 +02:00
• ea63f3312f personal oembed black/white list redmatrix 2015-08-04 20:07:55 -07:00
• 5344431fc0 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-08-04 16:02:12 -07:00
• a61fc00fa4 unobscure item before applying connection filter redmatrix 2015-08-04 15:59:18 -07:00
• f594a7776c Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-08-03 21:17:00 -07:00
• 56045093cc Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-08-03 21:13:54 -07:00
• 6826b4ad32 these were some really difficult bugs to find redmatrix 2015-08-03 21:13:17 -07:00
• b737e224b1 more work separating Diaspora from core redmatrix 2015-08-03 16:52:51 -07:00
• 2b1e672316 Hubzilla addons added Haakon Meland Eriksen 2015-08-03 22:29:22 +02:00
• 5adb41a0ed Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-08-03 21:53:01 +02:00
• 2f5a39bc2f Merge pull request #382 from tuscanhobbit/master Paolo T 2015-08-03 09:24:39 +02:00
• 5d2f35dc60 Italian translation Paolo Tacconi 2015-08-03 09:21:01 +02:00
• db70c76494 diaspora_meta getting double json encoded redmatrix 2015-08-02 23:05:15 -07:00
• 9f5dfe797b begin moving diaspora to plugin redmatrix 2015-08-02 17:38:34 -07:00
• 49532aa6dd Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-08-02 16:47:36 -07:00
• ae15dde8fb revision update redmatrix 2015-08-02 16:45:57 -07:00
• c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-31 15:45:13 -07:00