Commit Graph

6292 Commits

Author SHA1 Message Date
Kim Gardner ae430245ec Merge pull request #970 from coralproject/default-in-stream-mod
Make in-stream moderation a default plugin
2017-09-19 11:47:25 +01:00
Kim Gardner ebe7ccfd10 Make in-stream moderation a default plugin 2017-09-19 11:09:22 +01:00
Kim Gardner 262213a520 Merge pull request #968 from coralproject/all-comments-translation
Replace hard-coded string on all comments tab with translation
2017-09-19 09:41:03 +01:00
Kim Gardner 0dfcbc9927 Merge branch 'master' into all-comments-translation 2017-09-19 09:11:44 +01:00
Kim Gardner a68e1c9c0b Merge pull request #969 from coralproject/helmet-config
Expose Helmet configuration
2017-09-19 09:11:14 +01:00
Wyatt Johnson 52c1989780 Expose Helmet configuration
- Fixes #962
2017-09-18 11:57:57 -06:00
Kiwi abd458ab82 Merge branch 'master' into all-comments-translation 2017-09-18 19:48:09 +02:00
Chi Vinh Le 41afe9fae7 Replace hard-coded string on all comments tab with translation 2017-09-19 00:41:38 +07:00
Kim Gardner e6fa0a6d12 Merge pull request #950 from coralproject/fix-notify-bugs
Fix error notification bugs
2017-09-18 18:38:09 +01:00
Belén Curcio a0fb6030ca Merge branch 'master' into fix-notify-bugs 2017-09-18 14:27:21 -03:00
Kim Gardner c95d0e45f8 Merge pull request #952 from coralproject/instream-ban
In-Stream Ban
2017-09-18 18:26:59 +01:00
Belén Curcio 7144f171ef Merge branch 'master' into fix-notify-bugs 2017-09-18 14:20:33 -03:00
Kim Gardner 23e1b56c6e Merge branch 'master' into instream-ban 2017-09-18 18:19:53 +01:00
Wyatt Johnson 9b999c6249 Merge pull request #967 from coralproject/fix-safari-rendering-issues
Fix safari rendering issues
2017-09-18 11:19:32 -06:00
Kiwi 7a81a125f5 Merge branch 'master' into fix-safari-rendering-issues 2017-09-18 19:14:07 +02:00
Chi Vinh Le ed22bc34fc Add a comment 2017-09-19 00:11:49 +07:00
Belen Curcio d7ea88c367 matching master 2017-09-18 14:10:44 -03:00
Belen Curcio afec9932f0 Merge branch 'master' of github.com:coralproject/talk into instream-ban 2017-09-18 14:08:41 -03:00
Chi Vinh Le 2c297d7c2f Promote modqueue comment into own layer to fix safari issues 2017-09-19 00:08:09 +07:00
Kim Gardner 2814070808 Merge pull request #955 from coralproject/static-url
Added support for changing the static url
2017-09-18 18:02:40 +01:00
Kim Gardner 6ed6726daf Merge branch 'master' into static-url 2017-09-18 17:57:49 +01:00
Kim Gardner 21936ae467 Merge pull request #963 from coralproject/react-linting-rules
Linting pass
2017-09-18 17:57:17 +01:00
Kim Gardner 613a7f7073 Merge branch 'master' into static-url 2017-09-18 17:56:38 +01:00
Kim Gardner 9258347886 Merge branch 'master' into instream-ban 2017-09-18 17:56:15 +01:00
Wyatt Johnson 212c6cd0ce Merge branch 'master' into react-linting-rules 2017-09-18 10:02:49 -06:00
Wyatt Johnson 5f3931f34b Merge pull request #966 from coralproject/toxic-comment-group-id
Turn toxic comment group_id into a constant
2017-09-18 09:49:22 -06:00
Belen Curcio aa3327945e Styles and copy 2017-09-18 12:42:21 -03:00
Chi Vinh Le c8dc5d4cd9 Turn toxic comment group_id into a constant 2017-09-18 22:39:30 +07:00
Wyatt Johnson 11c46439a2 corrected view error 2017-09-18 09:19:52 -06:00
Chi Vinh Le 33822ff6c0 More linting error fixes 2017-09-18 20:38:32 +07:00
Belen Curcio 5d153e764d Linting 2017-09-18 10:30:39 -03:00
Belen Curcio 597d67f5d2 Actions renamed 2017-09-18 10:28:02 -03:00
Belen Curcio 100dd519ee Replacing excludeIf 2017-09-18 10:12:28 -03:00
Belen Curcio eb03d62e51 Merge branch 'instream-ban' of github.com:coralproject/talk into instream-ban 2017-09-18 10:05:12 -03:00
Belen Curcio 8bfc7e942c Renaming 2017-09-18 10:04:39 -03:00
Chi Vinh Le 1a349eb0cd Turn on prop-types linter 2017-09-18 19:03:07 +07:00
Chi Vinh Le f19b333537 Fix some linter warnings 2017-09-18 18:56:52 +07:00
Kim Gardner c6c2d545f8 Merge branch 'master' into static-url 2017-09-18 12:55:28 +01:00
Kim Gardner ebe9945492 Merge branch 'master' into instream-ban 2017-09-18 12:54:54 +01:00
Kim Gardner c6403b2da3 Merge branch 'master' into fix-notify-bugs 2017-09-18 12:54:46 +01:00
Wyatt Johnson cd100a23cb Merge pull request #932 from pdehaan/eslint-react
Add react/recommended ESLint rules
2017-09-15 17:29:28 -06:00
Wyatt Johnson 25761f9e61 Merge branch 'master' into eslint-react 2017-09-15 17:22:51 -06:00
Wyatt Johnson 1a76a83806 Merge pull request #959 from coralproject/view-context-no-tombstone
Don't show tombstone during "view context"
2017-09-15 17:20:29 -06:00
Wyatt Johnson 55ebd1df8e Merge branch 'master' into view-context-no-tombstone 2017-09-15 17:16:07 -06:00
Wyatt Johnson c427691bef Merge pull request #958 from coralproject/detect-n-display-stream-errors
Detect and display stream errors
2017-09-15 17:15:34 -06:00
Wyatt Johnson 93afd793cb Merge branch 'master' into detect-n-display-stream-errors 2017-09-15 17:10:46 -06:00
Wyatt Johnson 35232cf015 Merge pull request #957 from coralproject/fix-config
Fix config parsing bug
2017-09-15 16:56:24 -06:00
Wyatt Johnson f864ebf2e3 Merge branch 'master' into fix-config 2017-09-15 15:56:46 -06:00
Wyatt Johnson a9cc78b61d Merge pull request #943 from coralproject/story/150848457
Added support for deep comment counts
2017-09-15 15:55:35 -06:00
Wyatt Johnson 2c3a52b48c Merge branch 'master' into story/150848457 2017-09-15 15:49:30 -06:00