2048 Commits

Author	SHA1	Message	Date
Belen Curcio	10e8a32c21	Changes	2017-05-10 15:57:21 -03:00
Belen Curcio	c3dff79e6e	Updated	2017-05-10 15:35:32 -03:00
Belen Curcio	7313aaa473	Merge branch 'config-embed' of github.com:coralproject/talk into config-embed	2017-05-10 15:09:19 -03:00
Belen Curcio	74ffc00c20	Adding changes	2017-05-10 15:02:43 -03:00
Belén Curcio	07778844dc	Merge branch 'master' into config-embed	2017-05-10 14:17:23 -03:00
Belén Curcio	ca51821d7b	Merge branch 'master' into config-embed	2017-05-10 12:01:29 -03:00
Belen Curcio	250a578dd7	lint, and merge conficts	2017-05-10 11:05:21 -03:00
Belen Curcio	8c219c1c4d	Adding config with initial	2017-05-09 15:53:57 -03:00
Belen Curcio	3c06ee9360	Adds slots to admin stream	2017-05-09 12:21:21 -03:00
Belén Curcio	c020008fad	Merge branch 'master' into config-embed	2017-05-09 10:54:52 -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
Kim Gardner	70bb6f6632	Merge branch 'master' into approve-reject-noop	2017-05-05 16:53:14 -04:00
Riley Davis	4ff42385e3	remove dead code	2017-05-05 14:41:19 -06:00
Riley Davis	f8e8eef989	float: right; in css is just fine.	2017-05-05 14:05:52 -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
Belén Curcio	04812797a0	Merge branch 'master' into config-embed	2017-05-04 13:40:39 -03: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 Davis	1cecad4d32	action_type must be passed to the load more query	2017-05-03 14:13:58 -06:00
Belén Curcio	64c79cf5f2	Merge branch 'master' into config-embed	2017-05-03 16:52:30 -03: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	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
Riley Davis	324e82c070	not pretty, but it works	2017-05-03 10:20:03 -06:00
riley	e60bcb9caf	make sure load more on approve/reject queues doesn't cause a bug	2017-05-02 15:58:57 -06:00
riley	b7d3113677	apparently you can't make a fragment on RootQuery	2017-05-02 15:18:48 -06:00
Belén Curcio	ea7888809e	Merge branch 'master' into config-embed	2017-05-02 15:47:23 -03:00
Belen Curcio	cc0a23c295	Deconstruct plugin config	2017-05-02 15:40:37 -03:00
Belen Curcio	b444316e1c	Adding debug plugins	2017-05-02 15:31:58 -03:00
Belen Curcio	17128e9a47	Adds redux to handle external config data	2017-05-02 15:18:04 -03:00
Belen Curcio	f0c846493a	Passing data from script tag, into Talk	2017-05-02 14:51:09 -03:00
Kim Gardner	f6e2caf65f	Merge branch 'master' into admin-queue-polish	2017-05-02 12:38:48 -04:00
Kim Gardner	cdc1835f72	Merge branch 'master' into coral-plugin-like	2017-05-02 12:37:55 -04:00
Riley Davis	da5e8cda99	Merge branch 'master' into admin-queue-polish	2017-05-01 11:13:13 -06:00
Riley Davis	32dd554331	load more comments if the mod has moderated them all and there are more availabile	2017-05-01 10:30:18 -06:00