Commit Graph

8171 Commits

Author SHA1 Message Date
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
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
Matt Montgomery 3c66401546 Providers username for subscription fields 2018-02-06 16:29:25 -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 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 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
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
Kim Gardner 1dfce22b89 Merge pull request #1341 from coralproject/fix-zen-mode
Fix zen mode
2018-02-02 10:00:46 -05:00
Kiwi e36098369b Merge branch 'master' into fix-zen-mode 2018-02-02 15:53:13 +01:00
Chi Vinh Le aec0251c4f Fix zen mode 2018-02-02 15:50:43 +01:00
Kim Gardner c9613337d4 Merge pull request #1339 from coralproject/fix-flag-issues
Fix flag issues
2018-02-02 09:27:28 -05:00
Chi Vinh Le ac67b0484b Better fix 2018-02-02 12:12:58 +01:00
Chi Vinh Le edac21a4f4 Fix Flag Menu not working 2018-02-02 11:52:42 +01:00
Kim Gardner 86f4ae4b6d Merge pull request #1336 from icco/patch-2
Change text wrapping of Stories table
2018-02-01 13:56:31 -05:00
Nat Welch 219fcdddea Change text wrapping of Stories table 2018-02-01 13:26:34 -05:00
Chi Vinh Le 4464183b42 Linting 2018-02-01 18:25:35 +01:00
Kiwi ed8d9e985c Merge branch 'master' into keep-drafts 2018-02-01 18:19:30 +01:00
Chi Vinh Le 840fef84db Fix e2e 2018-02-01 18:17:35 +01:00
Wyatt Johnson 6c9411d173 Merge pull request #1333 from coralproject/remove-auth-data
Cleanly remove auth data from storage
2018-02-01 10:12:48 -07:00
Chi Vinh Le 6afb300d86 Unlisten 2018-02-01 17:55:53 +01:00
Kiwi 894141619c Merge branch 'master' into keep-drafts 2018-02-01 17:50:06 +01:00
Chi Vinh Le 7e135cef47 Add a little comment 2018-02-01 17:46:06 +01:00
Chi Vinh Le 34726e2c4e Implement DraftArea 2018-02-01 17:29:53 +01:00
Wyatt Johnson 1f6c29cee6 Merge branch 'master' into remove-auth-data 2018-02-01 09:21:53 -07:00