Commit Graph

5624 Commits

Author SHA1 Message Date
Kim Gardner 2c6447cd07 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-16 10:38:36 +01:00
Kim Gardner 198b347ff0 Merge pull request #856 from coralproject/base-path
Base Path Support
2017-08-16 10:22:50 +01:00
Wyatt Johnson 34a19c532d Merge branch 'master' into base-path 2017-08-15 15:04:37 -06:00
Wyatt Johnson 4c1ebde3cc Merge pull request #848 from coralproject/update-readme
Add important links to README
2017-08-15 15:02:45 -06:00
Wyatt Johnson 83388b0791 Merge branch 'master' into update-readme 2017-08-15 14:54:29 -06:00
Wyatt Johnson 8afbe9d30d applied path fixes to template 2017-08-15 14:45:45 -06:00
Wyatt Johnson 6b60ceb52e Merge branch 'master' into base-path 2017-08-15 14:24:13 -06:00
Wyatt Johnson e71eb28e42 added base path support for router, spelling fixes 2017-08-15 14:19:58 -06:00
Kim Gardner b81c2e480e Merge pull request #853 from coralproject/rm-immutable-js
Remove immutable js
2017-08-15 11:54:42 +01:00
Kim Gardner d2525ac8cf Merge branch 'master' into rm-immutable-js 2017-08-15 11:49:15 +01:00
Kim Gardner d38128bad9 Merge pull request #850 from coralproject/update-apollo
Update apollo and fix warnings
2017-08-15 11:49:08 +01:00
Kim Gardner ce63113c5d Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-15 11:28:00 +01:00
Kim Gardner 1220ce464e Merge branch 'master' into update-readme 2017-08-15 11:27:53 +01:00
Kim Gardner 1ca40a3592 Merge branch 'master' into rm-immutable-js 2017-08-15 11:27:45 +01:00
Kim Gardner ad4ea08a6a Merge branch 'master' into update-apollo 2017-08-15 11:21:47 +01:00
Kim Gardner dc3adf0413 Merge pull request #851 from coralproject/fix-ignore-user
Fix Ignored User in permalink
2017-08-15 11:05:23 +01:00
Kim Gardner ac2699856f Merge branch 'master' into fix-ignore-user 2017-08-15 10:50:33 +01:00
Kim Gardner c0f66277b3 Merge pull request #854 from coralproject/fix-error-offtopic
Fix console error in offtopic
2017-08-15 10:50:20 +01:00
Chi Vinh Le db37a0b38e Check existance of featuredComments in query 2017-08-15 16:43:44 +07:00
Kim Gardner cadfb57cd2 Merge branch 'master' into fix-error-offtopic 2017-08-15 10:36:19 +01:00
Kim Gardner 2284692931 Merge branch 'master' into fix-ignore-user 2017-08-15 10:31:26 +01:00
Kim Gardner 2827ca5229 Merge branch 'master' into update-readme 2017-08-15 10:28:59 +01:00
Kim Gardner f159d8a488 Merge pull request #855 from coralproject/fix-create-username-dialog
Fix FakeComment styles
2017-08-15 10:28:46 +01:00
Kim Gardner 15f1733fa1 Merge branch 'master' into fix-create-username-dialog 2017-08-15 10:23:28 +01:00
Kim Gardner 776f29a39d Merge pull request #852 from coralproject/fix-dashboard-links
Fix dashboard links
2017-08-15 10:20:10 +01:00
Chi Vinh Le c52a97338c Fix FakeComment styles 2017-08-14 21:25:48 +07:00
Chi Vinh Le abda77a7e7 Fix console error in offtopic 2017-08-14 19:55:04 +07:00
Chi Vinh Le 06cf33521f Remove immutable-js traces from docs 2017-08-14 19:41:35 +07:00
Chi Vinh Le cdfef8c989 Remove immutable 2017-08-14 16:56:51 +07:00
Chi Vinh Le 2e8863285d Rm immutable-js from admin 2017-08-14 16:49:00 +07:00
Chi Vinh Le 7360a43898 Remove immutable from embed stream 2017-08-11 22:50:12 +07:00
Chi Vinh Le 45cf72256b Fix dashboard links 2017-08-11 21:11:59 +07:00
Chi Vinh Le 17bc396b06 Fix Ignored User in permalink 2017-08-11 20:55:23 +07:00
Chi Vinh Le ada5e6f747 Update apollo and fix warnings 2017-08-11 19:53:08 +07:00
Wyatt Johnson 20b182f455 Merge branch 'master' into update-readme 2017-08-11 09:58:06 +10:00
Kim Gardner b60c879599 Merge pull request #849 from coralproject/pluggable-modqueues
Pluggable modqueues
v3.1.0
2017-08-10 17:32:36 +01:00
Kiwi 0f93d6ce8a Merge branch 'master' into pluggable-modqueues 2017-08-10 18:01:06 +02:00
Kim Gardner ed5810aceb Merge branch 'master' into update-readme 2017-08-10 16:50:46 +01:00
Kim Gardner b8ffe51812 Merge pull request #838 from coralproject/setup-fixes
Added whitelist question to cli-setup
2017-08-10 16:47:18 +01:00
Kim Gardner d008947b41 Add important links to README 2017-08-10 15:51:50 +01:00
Kim Gardner bf298b311a Merge branch 'master' into setup-fixes 2017-08-10 15:24:16 +01:00
Kim Gardner b1d9ca0640 Merge pull request #846 from coralproject/bump-version-3-1-0
Update version number to 3.1.0
2017-08-10 15:24:03 +01:00
Kim Gardner c0ac5b0799 Merge branch 'master' into bump-version-3-1-0 2017-08-10 14:56:16 +01:00
Kim Gardner 2039cc5b9e Merge pull request #845 from coralproject/cookie-updates
Cookie updates
2017-08-10 14:51:27 +01:00
Wyatt Johnson bb2284909f Merge branch 'master' into cookie-updates 2017-08-10 23:24:03 +10:00
Wyatt Johnson f018d7f597 Merge pull request #847 from coralproject/fix-tag-remove
Remove Tag should keep remaining tags
2017-08-10 23:23:40 +10:00
Chi Vinh Le 6794827a77 Support adding modqueues from plugins 2017-08-10 20:23:31 +07:00
Chi Vinh Le 6956b4cd31 Remove Tag should keep remaining tags 2017-08-10 18:39:02 +07:00
Chi Vinh Le 83ded4bda9 Refactor into queueConfig 2017-08-10 18:37:14 +07:00
Kim Gardner 1fea2f77c1 Merge branch 'master' into cookie-updates 2017-08-10 12:04:34 +01:00