Commit Graph
5469 Commits
Author SHA1 Message Date
Chi Vinh Le b6b7570bcc Remove subscription code 2017-08-02 18:14:52 +07:00
Belen Curcio 94901d40f3 Merge branch 'featured-adm' of github.com:coralproject/talk into featured-adm 2017-08-01 18:27:38 -03:00
Belen Curcio 145910c4a6 Merge branch 'master' of github.com:coralproject/talk into featured-adm 2017-08-01 18:27:12 -03:00
Belen Curcio 4e5f1528f9 BE Subscription for Featured Comments 2017-08-01 18:27:02 -03:00
Kim GardnerandGitHub 975a616ce7 Merge branch 'master' into featured-adm 2017-08-01 16:19:52 -04:00
Kim GardnerandGitHub de7d5e542b Merge pull request #828 from coralproject/portuguese-translation
Portuguese translations
2017-08-01 16:18:10 -04:00
Belén CurcioandGitHub ddf15df8a6 Merge branch 'master' into featured-adm 2017-08-01 15:10:31 -03:00
Kim Gardner 9429fe1afe Fix some tenses 2017-08-01 13:50:37 -04:00
Kim GardnerandGitHub 8157a223d0 Merge branch 'master' into portuguese-translation 2017-08-01 13:38:45 -04:00
Kim GardnerandGitHub 0039c05a78 Merge pull request #825 from coralproject/provide-valid-optimistic-status
Provide a valid comment status in optimistic response
2017-08-01 13:38:31 -04:00
Kim GardnerandGitHub b03223b67b Merge branch 'master' into portuguese-translation 2017-08-01 13:37:48 -04:00
Kim Gardner c93c7b6ba1 Update text 2017-08-01 13:34:26 -04:00
Kim Gardner 4ad055197b Missing translation 2017-08-01 13:33:00 -04:00
Kim Gardner eac8c63045 Fix language files 2017-08-01 13:28:59 -04:00
Kim Gardner d300025c00 Update i18n config 2017-08-01 12:55:05 -04:00
Kim Gardner fdda5e5bef Add Portuguese translation of Talk core 2017-08-01 12:53:51 -04:00
Belen Curcio 779260c245 Working featured comments on the admin side 2017-08-01 13:06:21 -03:00
Kim GardnerandGitHub 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
Belen Curcio 5266bfa647 Components, UI/UX and Styling 2017-08-01 12:38:41 -03:00
Kim GardnerandGitHub 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 GardnerandGitHub 1487a454e9 Merge branch 'master' into fix-popup-safari-errors 2017-08-01 11:05:17 -04:00
Kim GardnerandGitHub c1a0273e84 Merge pull request #813 from coralproject/new-queue
New Queue
2017-08-01 11:04:17 -04:00
Belen Curcio d40242f92f Merge branch 'master' of github.com:coralproject/talk into featured-adm 2017-08-01 11:28:10 -03:00
Chi Vinh Le 5b751b7ba4 Fix Safari issues for popups 2017-08-01 20:32:49 +07:00
KiwiandGitHub 270d9b3e22 Merge branch 'master' into new-queue 2017-08-01 14:34:56 +02:00
Wyatt JohnsonandGitHub 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
KiwiandGitHub fa451a8240 Merge branch 'master' into new-queue 2017-08-01 14:31:18 +02:00
Wyatt JohnsonandGitHub 8672dea500 Merge branch 'master' into babel 2017-08-01 22:26:40 +10:00
Wyatt JohnsonandGitHub 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 GardnerandGitHub 57ff4f10f3 Merge branch 'master' into babel 2017-07-31 19:22:51 -04:00
Kim GardnerandGitHub bb5f245df8 Merge branch 'master' into new-queue 2017-07-31 19:21:57 -04:00
Kim GardnerandGitHub b568f1f8a8 Merge pull request #820 from coralproject/comment-context-label
Label for inactive comments
2017-07-31 19:09:31 -04:00
Kim GardnerandGitHub 4d9227840b Merge branch 'master' into babel 2017-07-31 18:44:11 -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 GardnerandGitHub ef22909c6c Merge branch 'master' into comment-context-label 2017-07-31 15:29:28 -04:00