Commit Graph

7162 Commits

Author SHA1 Message Date
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
Wyatt Johnson 0b1a75726c Merge pull request #956 from coralproject/story/150636425
Status SYSTEM_WITHHELD
2017-09-15 15:49:11 -06:00
Wyatt Johnson 384c126d9e added docs 2017-09-15 15:29:20 -06:00
Wyatt Johnson f97094177a revamped configuration for moderation phases 2017-09-15 14:23:18 -06:00
Kiwi 4739f86739 Merge branch 'master' into eslint-react 2017-09-15 20:43:49 +02:00
Chi Vinh Le f386909748 Don't show tombstone during "view context" 2017-09-16 01:36:15 +07:00
Chi Vinh Le aa4f781d25 Better error detection 2017-09-16 01:30:26 +07:00
Chi Vinh Le 4567b4565f Detect and display stream errors 2017-09-16 01:19:59 +07:00
Chi Vinh Le 3133922100 Fix config parsing bug 2017-09-16 01:02:19 +07:00
Kiwi e9bd5e4476 Merge branch 'master' into story/150848457 2017-09-15 19:53:00 +02:00
Wyatt Johnson f2e06d6d27 Merge branch 'master' into story/150636425 2017-09-15 09:57:57 -06:00
Chi Vinh Le e31cdebc12 Make it appear in reported queue 2017-09-15 22:52:19 +07:00
Wyatt Johnson e03e7de82f Merge branch 'master' into static-url 2017-09-15 09:46:05 -06:00
Wyatt Johnson c7b755d2ff Merge pull request #954 from coralproject/url-fix
Fixed embed url link
2017-09-15 08:40:55 -06:00
Chi Vinh Le dc7013187d Merge branch 'master' into story/150636425 2017-09-15 19:11:31 +07:00
Belen Curcio 20c4148301 Close and styling 2017-09-14 17:37:47 -03:00
Belen Curcio ba24af015c Merge branch 'instream-ban' of github.com:coralproject/talk into instream-ban 2017-09-14 17:37:31 -03:00
Wyatt Johnson 94456674df fixed embed url link 2017-09-14 14:32:16 -06:00
Belen Curcio 5231c2d627 Removing perms mods 2017-09-14 17:28:54 -03:00
Wyatt Johnson f74e8dda16 added support for changing the static url 2017-09-14 14:27:45 -06:00
Wyatt Johnson 825d53afcd Merge branch 'master' into eslint-react 2017-09-14 13:28:53 -06:00
Wyatt Johnson 029877080d Merge branch 'master' into fix-notify-bugs 2017-09-14 13:28:34 -06:00
Wyatt Johnson 83f10a4863 Merge branch 'master' into story/150848457 2017-09-14 13:27:53 -06:00
Wyatt Johnson d820d2d2c3 moved support for deepReplyCount to seperate field 2017-09-14 13:08:01 -06:00
Belén Curcio a6443f2bcc Merge branch 'master' into instream-ban 2017-09-14 13:05:58 -03:00
Kim Gardner 7ace5b369a Merge pull request #951 from coralproject/update-readme
Update README
2017-09-14 16:49:40 +01:00
Kim Gardner cf66c10262 Update README 2017-09-14 16:45:19 +01:00
Kiwi 99296ebe69 Merge branch 'master' into fix-notify-bugs 2017-09-14 17:25:50 +02:00
Chi Vinh Le 7600ce8d26 Fix error notification bugs 2017-09-14 22:22:16 +07:00
Kim Gardner 26256b979e Merge branch 'master' into story/150848457 2017-09-14 16:20:20 +01:00
Kim Gardner 0113f02994 Merge pull request #944 from coralproject/new-regexp-highlighter
Better wordlist service and highlighter
2017-09-14 16:20:06 +01:00