4030 Commits

Author	SHA1	Message	Date
Belen Curcio	10e8a32c21	Changes	2017-05-10 15:57:21 -03:00
Belen Curcio	0a2b26b599	Exports	2017-05-10 15:53:33 -03:00
Belen Curcio	c3dff79e6e	Updated	2017-05-10 15:35:32 -03:00
riley	602c3d0be2	use a slot instead of trying to use facebook directly	2017-05-10 12:28:33 -06: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
Belen Curcio	2673de5059	lintin	2017-05-10 14:59:10 -03:00
Belen Curcio	644d00d5d8	Adding coral-plugin-api	2017-05-10 14:57:24 -03:00
Riley Davis	75fb7b6dc2	Merge branch 'master' into user-detail-ui	2017-05-10 11:44:36 -06:00
Belén Curcio	07778844dc	Merge branch 'master' into config-embed	2017-05-10 14:17:23 -03:00
Belen Curcio	cb45e33b41	merge	2017-05-10 14:15:24 -03:00
Belen Curcio	26e5631f52	Changing path for hocs	2017-05-10 14:13:32 -03:00
Belen Curcio	3e1b7591e0	Adds displayName for WrappedReactions and alreadyReacted	2017-05-10 14:07:58 -03:00
Riley Davis	40ff265ab1	merge master	2017-05-10 11:07:48 -06:00
Belen Curcio	19bf7f6cf8	Adds displayName for WrappedReactions	2017-05-10 13:58:05 -03:00
Belen Curcio	ad24ff78d2	Merge branch 'master' of github.com:coralproject/talk into coral-reaction	2017-05-10 13:46:11 -03:00
Gabriela Rodríguez Berón	f1e4f98055	Merge branch 'master' into 142993479-tags	2017-05-10 08:50:28 -07:00
Riley Davis	fe279587b5	add staff to dropdown	2017-05-10 09:25:39 -06: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
Belén Curcio	af89ef45f2	Merge branch 'master' into coral-reaction	2017-05-09 15:54:36 -03:00
Belen Curcio	8c219c1c4d	Adding config with initial	2017-05-09 15:53:57 -03:00
Kim Gardner	b81b789afa	Merge branch 'master' into query-mutation-api	2017-05-09 14:29:27 -04:00
Benjamin Goering	994b5006b6	Merge branch 'master' into edit-comment	2017-05-09 09:12:14 -07: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
Belén Curcio	5b22bfbac2	Merge branch 'master' into coral-reaction	2017-05-09 11:40:30 -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
Belén Curcio	58ce5d5055	Merge branch 'master' into coral-reaction	2017-05-09 08:52:04 -03:00
Kiwi	f9259ead50	Merge branch 'master' into query-mutation-api	2017-05-09 17:49:50 +07:00
Kiwi	6fb227eb72	Merge branch 'master' into approve-reject-noop	2017-05-09 17:49:30 +07:00
Gabriela Rodríguez Berón	b8e530ca1f	Merge branch 'master' into 142993479-tags	2017-05-08 21:08:28 -07:00
Benjamin Goering	8af7168f4f	Merge branch 'master' into edit-comment	2017-05-08 19:26:38 -07:00
gaba	da0cebbda7	Fix the plugin TagLabel to show the staff tag.	2017-05-08 17:06:49 -07:00
gaba	7c09902294	The name for the tag is called ID.	2017-05-08 16:55:11 -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
Belen Curcio	b82cab0655	Lint	2017-05-08 17:50:15 -03:00
Belen Curcio	b547ad44f1	Better and more friendly API	2017-05-08 17:46:56 -03:00
Riley Davis	85fae3104e	float: right; in css is just fine.	2017-05-08 13:12:21 -07:00
Chi Vinh Le	028e13761f	Complete graphql code refactor in framework	2017-05-09 03:05:19 +07:00
Chi Vinh Le	57e7396997	Use correct fragment name	2017-05-09 02:58:50 +07:00
Chi Vinh Le	80d08bbe2e	Port StopIgnoringUser Mutation	2017-05-09 02:50:52 +07:00
Chi Vinh Le	5c44922d2b	Port IgnoreUser mutation	2017-05-09 02:46:42 +07:00
Chi Vinh Le	7077300dbc	Fix refetchQueries	2017-05-09 02:45:28 +07:00
Riley Davis	c00e6c1ece	default view is moderate > all	2017-05-08 13:40:24 -06:00