2221 Commits

Author	SHA1	Message	Date
Belen Curcio	bd21719ea5	Handling non safari browsers	2017-05-24 17:20:23 -03:00
Belen Curcio	8266c65043	Merge Conflicts	2017-05-22 09:39:04 -03:00
Belen Curcio	317f7134f2	linting	2017-05-22 09:03:10 -03:00
Belen Curcio	9936b6ec47	Prettier	2017-05-22 08:59:34 -03:00
Belen Curcio	1d96f67db6	Merge branch 'master' of github.com:coralproject/talk into coral-plugin-auth	2017-05-22 08:58:33 -03:00
Belen Curcio	1aacb565d4	linting	2017-05-19 20:10:49 -03:00
Belen Curcio	801a6f8a53	External plugin auth fully working, now refactor	2017-05-19 20:00:33 -03:00
Belen Curcio	dbfd2aff7c	SignInButton	2017-05-19 19:29:50 -03:00
Belen Curcio	3af49de0ce	New login slots and auth plugins	2017-05-19 18:04:54 -03:00
Belen Curcio	87ada30eff	Ádding Stream Slot	2017-05-19 17:32:16 -03:00
riley	2c620c868d	merge master	2017-05-19 11:05:46 -06:00
Kiwi	8cb9945e25	Merge branch 'master' into multiple-roles	2017-05-19 23:26:45 +07:00
riley	17ceadd8c9	move client-side perms to services	2017-05-19 09:18:24 -06:00
Chi Vinh Le	1374217680	Merge branch 'master' into suspend-user	2017-05-19 17:46:06 +07:00
Kim Gardner	b3e494d279	Merge branch 'master' into read-only-inputs	2017-05-18 17:14:48 -04:00
Kim Gardner	12ec058588	Merge branch 'master' into edit-comment-settings	2017-05-18 17:07:37 -04:00
Riley Davis	c772cffc92	handle no-interaction input the correct way	2017-05-18 13:51:48 -06:00
Chi Vinh Le	89b7918e41	Tiny renaming	2017-05-19 02:29:59 +07:00
Chi Vinh Le	b521934ee2	Remove unneeded refetch	2017-05-19 02:24:47 +07:00
Chi Vinh Le	061c18670b	Merge branch 'master' into suspend-user ... Conflicts: client/coral-admin/src/constants/moderation.js client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js	2017-05-19 02:19:24 +07:00
Chi Vinh Le	0588a8ab66	Use async / await :-)	2017-05-19 02:07:38 +07:00
Chi Vinh Le	f641a3ec40	Complete suspend user implementation	2017-05-19 01:52:03 +07:00
Kim Gardner	e80e79f267	Merge branch 'master' into edit-comment-settings	2017-05-18 14:23:14 -04:00
riley	ff75b9474a	merge master	2017-05-18 12:18:00 -06:00
riley	056ba9a04c	do the same thing for the Drawer	2017-05-18 12:11:11 -06:00
riley	d98ce38bf5	show config tab to admins. hide menu items from users that can't access admin	2017-05-18 12:06:07 -06:00
Benjamin Goering	1d322d8c70	Merge branch 'master' into fix-ignore-user	2017-05-18 10:50:00 -07:00
Benjamin Goering	aaa2da6c23	Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero	2017-05-18 10:43:38 -07:00
Wyatt Johnson	12713dae86	Removed unused assets	2017-05-18 11:18:08 -06:00
Benjamin Goering	fb33eefe8e	trivial changes requested by review	2017-05-18 08:19:52 -07:00
Benjamin Goering	cfc6d4bfea	Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user	2017-05-18 08:12:40 -07:00
Benjamin Goering	6bbeee3a6b	StopIgnoringUser does not refetch EmbedQuery	2017-05-18 08:11:39 -07:00
Benjamin Goering	340d3cea62	contains/Stream setCommentCountCache waits for refetch promise	2017-05-18 08:10:20 -07:00
Kim Gardner	e8e9dbe3ca	Merge branch 'master' into fix-ignore-user	2017-05-18 09:49:54 -04:00
Benjamin Goering	cb45f0a8b3	Merge branch 'master' into edit-comment-settings	2017-05-17 15:46:14 -07:00
Benjamin Goering	d93ad38dd1	Admins can change Edit Comment Window length in Moderation Settings	2017-05-17 15:39:19 -07:00
riley	c4210db307	staff should not see moderate tag. translations	2017-05-17 16:10:02 -06:00
riley	3fc1029a93	do not require auth in the Header	2017-05-17 16:00:01 -06:00
Riley Davis	54abaeb587	wrap the not-authorized warning in a template	2017-05-17 15:47:41 -06:00
Riley Davis	4a97db3357	emma's copy	2017-05-17 15:41:49 -06:00
Riley Davis	88377b3180	do not show Config tab for non-admins	2017-05-17 15:37:13 -06:00
Riley Davis	e343897526	user detail copy button regression	2017-05-17 15:11:00 -06:00
Benjamin Goering	294eb6c81d	Merge branch 'master' into fix-ignore-user	2017-05-17 13:57:23 -07:00
Benjamin Goering	9eac05c8fb	Ignored user tombstones work again	2017-05-17 13:18:59 -07:00
Chi Vinh Le	492b973206	Add 1 extra suspension minute	2017-05-18 02:28:01 +07:00
Chi Vinh Le	2bdf413b88	Integrate into embed stream	2017-05-18 02:28:01 +07:00
Chi Vinh Le	76e87f4c34	Move previous suspendUser feature to rejectUsername	2017-05-18 02:28:01 +07:00
Riley Davis	c66e3141e0	actually check permissions	2017-05-17 11:38:43 -06:00
Riley Davis	a0f41bb19d	show total comments and rejected %	2017-05-17 10:54:14 -06:00
Chi Vinh Le	056ff427a5	Merge branch 'master' into suspend-user	2017-05-17 21:50:28 +07:00