Commit Graph

8345 Commits

Author SHA1 Message Date
Chi Vinh Le 2a78ce2bf1 Restore flagged queue 2017-08-01 17:18:52 +07:00
Chi Vinh Le b1b24d0f9d Change admin index route 2017-08-01 17:18:41 +07:00
Chi Vinh Le 3ae6dff098 Change href of moderate stream 2017-08-01 17:16:53 +07:00
Wyatt Johnson de97ad59ec Added configuration for the babel polyfill 2017-08-01 19:14:26 +10:00
Wyatt Johnson 83762b880f Added support for reconfiguring the comment count cache expiry 2017-08-01 09:52:18 +10:00
Kim Gardner c2f866a077 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-07-31 19:22:57 -04:00
Kim Gardner 57ff4f10f3 Merge branch 'master' into babel 2017-07-31 19:22:51 -04:00
Kim Gardner bb5f245df8 Merge branch 'master' into new-queue 2017-07-31 19:21:57 -04:00
Kim Gardner b568f1f8a8 Merge pull request #820 from coralproject/comment-context-label
Label for inactive comments
2017-07-31 19:09:31 -04:00
Kim Gardner 4d9227840b Merge branch 'master' into babel 2017-07-31 18:44:11 -04:00
Kim Gardner 0d037c3acb Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-07-31 18:44:05 -04:00
Belen Curcio 78e74336db Moderator Featured Tag/Button 2017-07-31 18:07:37 -03:00
Belen Curcio f3f441eb40 Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-31 16:44:54 -03:00
Kim Gardner ef22909c6c Merge branch 'master' into comment-context-label 2017-07-31 15:29:28 -04:00
Kim Gardner a5790ca4df Merge pull request #819 from coralproject/comment-stream-tag-uniformity
create uniformity on tag label styling
2017-07-31 15:25:32 -04:00
Kim Gardner 109ef0cea4 Merge branch 'master' into comment-stream-tag-uniformity 2017-07-31 15:16:17 -04:00
Kim Gardner 1626721622 Merge pull request #821 from coralproject/dont-agree-action
"Don't agree" is not a flag action
2017-07-31 15:15:16 -04:00
Belen Curcio 694669bb85 Removing withRouter 2017-07-31 15:51:32 -03:00
Belen Curcio 4831d2d6a7 Merge branch 'new-queue' of github.com:coralproject/talk into new-queue 2017-07-31 15:47:42 -03:00
Belen Curcio d330bf9c25 Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-31 15:47:12 -03:00
Belen Curcio 91d9d65372 Removing logic and adding active tabs 2017-07-31 15:46:06 -03:00
Chi Vinh Le 62a559b6fc "Don't agree" is not a flag action 2017-08-01 00:37:18 +07:00
Kim Gardner d606f4d094 Merge branch 'master' into new-queue 2017-07-31 12:55:53 -04:00
Belen Curcio 344d1840f0 lingin 2017-07-31 13:41:13 -03:00
Belen Curcio 4079a74ab8 Updated componentWillReceiveProps 2017-07-31 13:18:54 -03:00
Jeff Nelson 88f06744b4 unignore 2017-07-31 11:59:15 -04:00
Jeff Nelson 2c1cd50828 turn router method from get to post 2017-07-31 11:59:15 -04:00
Jeff Nelson 8c4612a4dd remove unused import 2017-07-31 11:59:15 -04:00
Jeff Nelson 4b13ccc5c1 enforce API key 2017-07-31 11:59:15 -04:00
Jeff Nelson b62ab9bff0 pass comment to presubmit hooks 2017-07-31 11:59:15 -04:00
Kiwi ba1dc3446b Merge branch 'master' into comment-context-label 2017-07-31 17:57:17 +02:00
Chi Vinh Le 3954b7a268 Label for inactive comments 2017-07-31 22:53:35 +07:00
Belen Curcio 31112b3a20 Passing to the container 2017-07-31 12:36:58 -03:00
Kim Gardner 337e6cc963 Merge branch 'master' into comment-stream-tag-uniformity 2017-07-31 11:01:00 -04:00
Kim Gardner 665bf5b102 Merge pull request #817 from coralproject/docs-update
Docs Updates
2017-07-31 11:00:39 -04:00
Samantha Hankins 70dcf2162f create uniformity on tag label styling 2017-07-31 10:52:26 -04:00
Belen Curcio 84391d9d69 Routes taking :id 2017-07-31 10:45:18 -03:00
Belen Curcio dbc8f87683 IndexRoute 2017-07-31 10:23:34 -03:00
Chi Vinh Le 97c75be604 Comments explaining why we have inactive comments in the stream 2017-07-31 20:17:06 +07:00
Belen Curcio 7f85b842f0 Adding fallback for separate assets 2017-07-31 10:09:21 -03:00
Chi Vinh Le fc3acecf61 Refactor isCommentActive logic 2017-07-31 20:09:16 +07:00
Belen Curcio 371348ced5 changes 2017-07-31 10:03:58 -03:00
Belen Curcio 33a75aa4d0 Moving flag to the bottom 2017-07-31 09:46:51 -03:00
Belen Curcio 1b017daf62 changes 2017-07-31 09:42:35 -03:00
Belen Curcio 4f34827ec8 accepted to approved 2017-07-31 09:38:39 -03:00
Belen Curcio c9df0e5e40 Changes 2017-07-31 09:36:00 -03:00
Belen Curcio ea17c068dd Remove Index and Redirect 2017-07-31 09:33:29 -03:00
Wyatt Johnson 08edddf0df adds support for babel-plugin-transform-runtime 2017-07-31 15:51:34 +10:00
Wyatt Johnson 12e48efa9f some docs updates 2017-07-31 14:11:40 +10:00
Wyatt Johnson 2217c89aa7 Merge pull request #815 from coralproject/embed-control-object
Embed Control
2017-07-31 11:27:20 +10:00