870 Commits

Author	SHA1	Message	Date
Kim Gardner	b3e494d279	Merge branch 'master' into read-only-inputs	2017-05-18 17:14:48 -04:00
Riley Davis	c772cffc92	handle no-interaction input the correct way	2017-05-18 13:51:48 -06:00
Benjamin Goering	fb33eefe8e	trivial changes requested by review	2017-05-18 08:19:52 -07: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 Davis	e343897526	user detail copy button regression	2017-05-17 15:11:00 -06:00
Riley Davis	a0f41bb19d	show total comments and rejected %	2017-05-17 10:54:14 -06:00
riley	7896b3f33b	merge master	2017-05-16 09:43:49 -06:00
Belen Curcio	2b7f545c2d	lint	2017-05-15 17:31:53 -03:00
Belen Curcio	b2e5c0452a	The merge conficts	2017-05-15 17:13:48 -03:00
Belen Curcio	75aa8d79df	linting	2017-05-15 14:50:26 -03:00
Belen Curcio	843c3a16c8	Admin share same network interface, and unifying actions	2017-05-15 14:48:12 -03:00
Belen Curcio	8754ade5a4	merge	2017-05-12 21:52:29 -03:00
Belen Curcio	5e8a02c461	Removing CSRF	2017-05-12 15:40:53 -03:00
Wyatt Johnson	ae5da93730	linting fixes	2017-05-11 17:44:51 -06:00
Wyatt Johnson	08e7a90d69	lint fixes	2017-05-11 17:34:47 -06:00
riley	602c3d0be2	use a slot instead of trying to use facebook directly	2017-05-10 12:28:33 -06:00
Riley Davis	75fb7b6dc2	Merge branch 'master' into user-detail-ui	2017-05-10 11:44:36 -06:00
Riley Davis	40ff265ab1	merge master	2017-05-10 11:07:48 -06:00
Belen Curcio	250a578dd7	lint, and merge conficts	2017-05-10 11:05:21 -03:00
Riley Davis	084f6b28ed	merge master	2017-05-09 10:06:41 -06:00
Belen Curcio	3c06ee9360	Adds slots to admin stream	2017-05-09 12:21:21 -03:00
Kiwi	4eb20108b1	Merge branch 'master' into approve-reject-noop	2017-05-09 20:06:11 +07:00
Kiwi	6fb227eb72	Merge branch 'master' into approve-reject-noop	2017-05-09 17:49:30 +07:00
Riley Davis	2490e65981	merge master	2017-05-08 17:09:23 -06:00
Riley Davis	242f3ea5ea	do not highlight partial word matches in admin since this is not how the backend works	2017-05-08 17:01:36 -06:00
Kim Gardner	b2c8e3b254	Merge branch 'master' into context-from-comment	2017-05-08 17:34:55 -04:00
Kim Gardner	6dd01b4334	Merge branch 'master' into mod-is-main-tab	2017-05-08 17:26:55 -04:00
Riley Davis	3e258b1787	move approved tab	2017-05-08 14:59:23 -06:00
Riley Davis	c00e6c1ece	default view is moderate > all	2017-05-08 13:40:24 -06:00
Riley Davis	4ff42385e3	remove dead code	2017-05-05 14:41:19 -06:00
Riley Davis	519ca7beb5	en español	2017-05-05 11:55:28 -06:00
Riley Davis	5db48e8c0f	make it a blue link instead of the whole thing	2017-05-05 11:35:18 -06:00
Riley Davis	5f9240f201	open the comment in context when clicked	2017-05-04 16:32:07 -06:00
Riley Davis	f3f0b9c858	change mouse cursor for disabled buttons	2017-05-04 15:55:46 -06:00
Riley Davis	4507059a04	same thing for BanUserDialog and the keyboard shortcuts	2017-05-04 15:43:23 -06:00
Riley Davis	67b17160cb	don't accept/reject when a comment is already accepted/rejected respectively	2017-05-04 14:42:43 -06:00
riley	57b0b5ec67	add a drawer for the user details	2017-05-04 13:58:43 -06:00
Riley Davis	d255ea84b1	merge master	2017-05-04 11:19:01 -06:00
Kim Gardner	7d0d4aa397	Merge branch 'master' into admin-queue-polish	2017-05-03 17:57:34 -04:00
riley	d02c82d0cd	Merge branch 'master' into admin-queue-polish	2017-05-03 14:25:46 -06:00
riley	26ebdde244	Merge branch 'master' into user-detail-ui	2017-05-03 14:25:40 -06:00
Riley Davis	1cecad4d32	action_type must be passed to the load more query	2017-05-03 14:13:58 -06:00
riley	c15c312c2c	typo	2017-05-03 13:35:33 -06:00
Riley Davis	e993328dc4	load only flagged comments in mod queue load more	2017-05-03 13:15:29 -06:00
riley	4a42436b7b	load user via HOC UserDetail	2017-05-03 12:54:02 -06:00
riley	3c6391e741	count should never be less than 0	2017-05-03 12:49:22 -06:00
riley	39bd0eca6f	remove pointless change	2017-05-03 12:45:49 -06:00
riley	354b51b4fe	use a reduce instead	2017-05-03 11:14:21 -06:00
Riley Davis	c78e00711a	remove if statements	2017-05-03 10:54:52 -06:00