8775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Vinh Le	91bc7eaa53	Make condition more clear	2017-07-28 20:10:03 +07:00
Belén CurcioandGitHub	eb44c55e05	Merge branch 'master' into feature/talk-plugin-toxic-comments	2017-07-28 10:02:03 -03:00
Belén CurcioandGitHub	58a6333e02	Merge branch 'master' into user-detail-everywhere	2017-07-28 09:57:34 -03:00
Belen Curcio	4b0eeca08b	Merge branch 'new-queue' of github.com:coralproject/talk into new-queue	2017-07-28 09:54:55 -03:00
Belen Curcio	0111e08bc1	lintin	2017-07-28 09:48:34 -03:00
Belén CurcioandGitHub	0767c680fc	Merge branch 'master' into new-queue	2017-07-28 09:44:29 -03:00
Chi Vinh Le	7323c92b26	Optimize query during permalink view	2017-07-28 19:43:33 +07:00
Belen Curcio	c0ff056354	Old file	2017-07-28 09:39:12 -03:00
Chi Vinh Le	1f3d97fd6b	Allow admins / mods to view context of rejected or premod comments	2017-07-28 18:03:35 +07:00
Wyatt JohnsonandGitHub	4ed68259c6	Merge pull request #807 from coralproject/basepath ... Added support for hosting Talk under a different path	2017-07-28 08:44:29 +10:00
KiwiandGitHub	d5b7fd0413	Merge branch 'master' into user-detail-everywhere	2017-07-27 22:12:52 +02:00
Chi Vinh Le	389ff0ca0d	Change reducer property names	2017-07-28 03:03:19 +07:00
Chi Vinh Le	7a9aa331c5	viewUserDetail everywhere	2017-07-28 02:50:32 +07:00
Kim Gardner	673cb0ed04	Merge branch 'master' into basepath	2017-07-27 15:21:31 -04:00
Kim GardnerandGitHub	3f8b2b947c	Merge pull request #806 from coralproject/docs-update ... Docs update	2017-07-27 15:09:15 -04:00
Belen Curcio	dd8167a204	Check premod by asset	2017-07-27 14:42:36 -03:00
Belen Curcio	fba4b23dd0	Reordering Menu	2017-07-27 14:20:15 -03:00
Belen Curcio	200d41f2a5	New Queue	2017-07-27 14:15:49 -03:00
Kim GardnerandGitHub	75da26ff7a	Merge branch 'master' into feature/talk-plugin-toxic-comments	2017-07-27 13:02:53 -04:00
Kim GardnerandGitHub	c9442c7412	Merge branch 'master' into docs-update	2017-07-27 13:02:50 -04:00
Kim GardnerandGitHub	1994e44e94	Merge pull request #810 from coralproject/fix-viewing-options-plugin ... Fix viewing options plugin	2017-07-27 13:02:25 -04:00
Belen Curcio	3c960db93d	Merge branch 'master' of github.com:coralproject/talk into new-queue	2017-07-27 14:01:53 -03:00
Belen Curcio	47d37e31d8	prefixing translations	2017-07-27 13:50:14 -03:00
Belen Curcio	447c3aa7cc	Wrong reducer name	2017-07-27 13:48:03 -03:00
Belen Curcio	b3d1ff8003	Renaming flag by reported	2017-07-27 13:43:40 -03:00
Chi Vinh Le	ce2f8f97e8	Move userDetail out of Moderation route	2017-07-27 23:23:40 +07:00
Kim Gardner	cf8528dcf1	Remove file	2017-07-27 12:23:18 -04:00
Kim Gardner	9bd3e6b541	Fix translation file	2017-07-27 12:20:07 -04:00
Kim Gardner	f8758bd755	Fix folders	2017-07-27 11:58:36 -04:00
Kim GardnerandGitHub	93d0a265b5	Merge branch 'master' into feature/talk-plugin-toxic-comments	2017-07-27 11:05:17 -04:00
Kim GardnerandGitHub	46a2699ecb	Merge branch 'master' into docs-update	2017-07-27 11:05:06 -04:00
Kim GardnerandGitHub	ce0479ae5f	Merge pull request #779 from coralproject/renaming-talk ... Renaming Talk Plugins	2017-07-27 11:04:31 -04:00
Chi Vinh Le	57fb77008a	Make UserDetail work independently	2017-07-27 21:44:29 +07:00
Kim GardnerandGitHub	433c4fcd03	Merge branch 'master' into renaming-talk	2017-07-27 10:06:17 -04:00
Kim GardnerandGitHub	0f84586e1e	Merge pull request #805 from coralproject/redis-fixes ... Fixed bug with Kue	2017-07-27 10:05:55 -04:00
Wyatt Johnson	f4b765ccc5	template updates	2017-07-27 16:50:49 +10:00
Wyatt Johnson	0d7e4d6541	Added support for hosting Talk under a different path	2017-07-27 16:37:26 +10:00
Wyatt Johnson	30b3e91fdb	documented more env vars	2017-07-27 15:34:04 +10:00
Wyatt Johnson	a54a240ae6	fixed bug with job init	2017-07-27 15:14:11 +10:00
Wyatt Johnson	b482cf0a0f	updated styles	2017-07-27 12:03:25 +10:00
Kim Gardner	3a1a5e4e37	Fix merge conflicts	2017-07-26 21:49:50 -04:00
Wyatt JohnsonandGitHub	1a1d28c915	Merge pull request #788 from coralproject/docs-update ... Updated docs, theme, jekyll	2017-07-27 11:33:56 +10:00
Kim GardnerandGitHub	1359dfdc0b	Merge branch 'master' into renaming-talk	2017-07-26 21:29:19 -04:00
Kim Gardner	e7bc3002ef	Add translations file for viewing options plugin	2017-07-26 21:21:42 -04:00
Wyatt JohnsonandGitHub	7eee40368a	Merge branch 'master' into docs-update	2017-07-27 11:21:40 +10:00
Wyatt JohnsonandGitHub	8d59678c8c	Merge pull request #802 from coralproject/no-yarn-generate-introspection ... Don't use `yarn generate-introspection`	2017-07-27 11:21:17 +10:00
Kim Gardner	7058e7e7e8	Merge branch 'master' into renaming-talk	2017-07-26 21:16:18 -04:00
Wyatt JohnsonandGitHub	0d7acbd44d	Merge branch 'master' into no-yarn-generate-introspection	2017-07-27 11:12:22 +10:00
Wyatt JohnsonandGitHub	9c425c371d	Merge pull request #801 from coralproject/jwt ... Secret Rotation + Improvements	2017-07-27 11:10:19 +10:00
Wyatt JohnsonandGitHub	8cee74ae06	Merge branch 'master' into jwt	2017-07-27 11:05:26 +10:00