Commit Graph

8197 Commits

Author SHA1 Message Date
Wyatt Johnson 79cb8b0fb2 Merge branch 'master' into events 2018-02-09 18:36:34 -07:00
Wyatt Johnson 90290cfa2d patched bug 2018-02-09 18:33:13 -07:00
Wyatt Johnson 8b669a31c5 initial notification draft
- implements new notification manager using connect api
- first use case of plugins using the plugin api
2018-02-09 18:17:25 -07:00
Wyatt Johnson aaa1e0dbc3 enhanced mailer
- added template system for dynamic re-registration of email templates
- permitted no-auth based smtp schemes (to support inbucket)
- added helper registration for dynamic components in the templates
2018-02-09 18:00:37 -07:00
Wyatt Johnson eab1e6ca59 refactored resolvers, cleaned 2018-02-09 18:00:12 -07:00
Kim Gardner d2235f9918 Merge pull request #1338 from leeeandroo/admin-user-details
Admin user details translations and wording
2018-02-08 12:50:00 -05:00
Kim Gardner 5ebb99740b Merge branch 'master' into admin-user-details 2018-02-08 12:07:12 -05:00
Kim Gardner 2978d6138c Merge pull request #1349 from coralproject/akismet
Akismet
2018-02-08 12:07:02 -05:00
Kim Gardner 4dbd9e7df1 Merge branch 'master' into akismet 2018-02-08 11:57:49 -05:00
Kim Gardner 686096bfae Merge pull request #1352 from coralproject/change-comment-not-found-text
Update stream.comment_not_found text
2018-02-08 11:57:31 -05:00
Kim Gardner ddb80a95c1 Merge branch 'master' into akismet 2018-02-08 11:38:20 -05:00
Kim Gardner 18cc8b9389 Update stream.comment_not_found text 2018-02-08 11:28:21 -05:00
Kim Gardner 22467ac123 Merge branch 'master' into admin-user-details 2018-02-08 11:26:11 -05:00
Wyatt Johnson 2407cb9594 Merge pull request #1351 from mattmontgomery/patch-1
Provides username for subscription fields
2018-02-07 10:47:32 -07:00
Wyatt Johnson 3c04e6c7ec Merge branch 'master' into patch-1 2018-02-07 10:40:14 -07:00
Wyatt Johnson 52491d81a9 Merge pull request #1346 from mattmontgomery/patch-2
Adds logout for non-admin users
2018-02-07 10:40:05 -07:00
Wyatt Johnson 77723e3fb3 Merge branch 'master' into patch-2 2018-02-07 10:32:34 -07:00
Wyatt Johnson b758dc91cb added new plugin hook for connectors 2018-02-07 10:03:06 -07:00
Leandro bba14f502a Merge branch 'admin-user-details' of https://github.com/leeeandroo/talk into admin-user-details 2018-02-07 09:14:28 +01:00
Leandro 44913864eb remove identification changes on UserDetails 2018-02-07 09:12:39 +01:00
Matt Montgomery 3c66401546 Providers username for subscription fields 2018-02-06 16:29:25 -07:00
Wyatt Johnson cdf3c44083 Merge branch 'master' into events 2018-02-06 14:33:57 -07:00
Wyatt Johnson 26cba9af63 Merge branch 'master' into events 2018-02-06 14:31:07 -07:00
Wyatt Johnson 2e6a7c0559 Merge pull request #1335 from coralproject/keep-drafts
Keep comment drafts
2018-02-06 14:30:27 -07:00
Wyatt Johnson e7fc33c667 Merge branch 'master' into keep-drafts 2018-02-06 14:21:53 -07:00
Wyatt Johnson 1cc484b61e Merge branch 'master' into akismet 2018-02-06 14:06:03 -07:00
Wyatt Johnson 17fefcb4bd adjusted docs 2018-02-06 13:47:57 -07:00
Wyatt Johnson f4d520fbaa adjusted translations 2018-02-06 13:44:28 -07:00
Kim Gardner a5c08129ce Merge branch 'master' into admin-user-details 2018-02-06 14:20:26 -05:00
Kim Gardner 7c859ad4c3 Merge branch 'master' into patch-2 2018-02-06 14:20:00 -05:00
Kim Gardner 2b2a762623 Merge pull request #1348 from coralproject/password-attempt-typo
Correct password attempt comment
2018-02-06 14:13:07 -05:00
Kim Gardner b9cfddc5c0 Merge branch 'master' into keep-drafts 2018-02-06 14:06:57 -05:00
Wyatt Johnson 7dca937de2 Merge branch 'master' into password-attempt-typo 2018-02-06 10:37:05 -07:00
Wyatt Johnson 6cb3fc7be8 added docs for akismet 2018-02-06 10:23:26 -07:00
Kim Gardner 95211e6cb9 Merge pull request #1345 from mattmontgomery/patch-1
Use translate-able `sign_out`
2018-02-06 12:23:07 -05:00
Wyatt Johnson db322d192f added note 2018-02-06 09:58:02 -07:00
Wyatt Johnson bf98050d33 Merge branch 'master' into akismet 2018-02-06 09:49:13 -07:00
Kim Gardner caa588f11d Merge branch 'master' into keep-drafts 2018-02-06 11:36:31 -05:00
Kim Gardner 764ba4ab36 Correct password attempt comment 2018-02-06 11:21:41 -05:00
Matt Montgomery 9c139eb703 Fixes prettier/prettier linting error 2018-02-05 17:46:10 -07:00
Matt Montgomery c289ed149f Adds logout for non-admin users 2018-02-05 17:17:51 -07:00
Matt Montgomery 05d80a0549 Use translate-able sign_out 2018-02-05 17:03:44 -07:00
Kim Gardner 8bef21274d Merge branch 'master' into admin-user-details 2018-02-05 11:31:28 -05:00
Kim Gardner 869fb9d029 Merge pull request #1344 from coralproject/rem-semi
Remove semicolon
v4.1.0
2018-02-05 11:30:19 -05:00
Chi Vinh Le cb077a87dc Remove semicolon 2018-02-05 17:22:13 +01:00
Kim Gardner 6d662e4469 Merge branch 'master' into admin-user-details 2018-02-05 10:59:42 -05:00
Wyatt Johnson 901c96a67a Merge pull request #1343 from mattmontgomery/patch-2
Changes node requirement notation
2018-02-03 13:10:22 -07:00
Matt Montgomery 6b5a690c4f Changes node requirement notation
This changes the notation for the `node` requirement. Solves #1342
2018-02-02 17:04:01 -07:00
Wyatt Johnson 9debb0d48d Merge branch 'master' into akismet 2018-02-02 15:01:06 -07:00
Wyatt Johnson 484ae2539b added akismet support 2018-02-02 15:00:47 -07:00