Commit Graph

5449 Commits

Author SHA1 Message Date
Kim Gardner faa6971961 Merge branch 'master' into provide-valid-optimistic-status 2017-08-01 11:59:34 -04:00
Chi Vinh Le 26c70bcee8 Provide a valid comment status in optimistic response 2017-08-01 22:44:53 +07:00
Kim Gardner 08a491b3a0 Merge pull request #824 from coralproject/fix-popup-safari-errors
Fix Safari issues for popups
2017-08-01 11:11:14 -04:00
Kim Gardner 1487a454e9 Merge branch 'master' into fix-popup-safari-errors 2017-08-01 11:05:17 -04:00
Kim Gardner c1a0273e84 Merge pull request #813 from coralproject/new-queue
New Queue
2017-08-01 11:04:17 -04:00
Chi Vinh Le 5b751b7ba4 Fix Safari issues for popups 2017-08-01 20:32:49 +07:00
Kiwi 270d9b3e22 Merge branch 'master' into new-queue 2017-08-01 14:34:56 +02:00
Wyatt Johnson a4815ff927 Merge pull request #818 from coralproject/babel
Adds support for disabling the babel-polyfill on the parent embed.js
2017-08-01 22:32:20 +10:00
Kiwi fa451a8240 Merge branch 'master' into new-queue 2017-08-01 14:31:18 +02:00
Wyatt Johnson 8672dea500 Merge branch 'master' into babel 2017-08-01 22:26:40 +10:00
Wyatt Johnson 1a470957ab Merge pull request #823 from coralproject/cache-count-expiry
Added support for reconfiguring the comment count cache expiry
2017-08-01 22:26:28 +10:00
Wyatt Johnson dbeb31f0a7 removed more babel-runtime 2017-08-01 22:22:03 +10:00
Wyatt Johnson a99ffa1228 removed all traces of transform-runtime 2017-08-01 22:18:56 +10:00
Wyatt Johnson 2ac6a9d829 changes to babelrc 2017-08-01 22:12:02 +10:00
Chi Vinh Le 9929046536 Fix reported queue take 2 2017-08-01 18:06:06 +07:00
Chi Vinh Le cb874f8670 Change moderate link in user detail 2017-08-01 17:29:36 +07:00
Chi Vinh Le d2c8019408 Change moderate link 2017-08-01 17:28:51 +07:00
Chi Vinh Le 33a30e4f8d Remove unnessecary query fields 2017-08-01 17:24:48 +07:00
Chi Vinh Le 59ea17119d Remove unnessecary arrow function 2017-08-01 17:20:29 +07:00
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 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
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
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