8345 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Wyatt Johnson	a3a8d23797	patched bug with adding action	2017-05-10 12:18:42 -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
Belén Curcio	67c202d89f	Merge pull request #577 from coralproject/admin-slots ... Admin Mod Queue Slots and Coral Plugin Mod example	2017-05-10 13:53:20 -03:00
Belen Curcio	ad24ff78d2	Merge branch 'master' of github.com:coralproject/talk into coral-reaction	2017-05-10 13:46:11 -03:00
Wyatt Johnson	f8b207e563	Return a meaningful error	2017-05-10 10:29:20 -06: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
Wyatt Johnson	17b9e43c14	moved webpack config	2017-05-09 16:53:30 -06:00
Wyatt Johnson	785e5a4ac8	Collected config	2017-05-09 16:49:11 -06:00
Benjamin Goering	650e8e205e	Merge branch 'edit-comment' of github.com:gobengo/talk into edit-comment	2017-05-09 15:03:19 -07:00
Benjamin Goering	f37a210479	Only use errors from errors.js for EditWindowHasEnded	2017-05-09 15:02:26 -07:00
Wyatt Johnson	76d0fdfd67	Added docs	2017-05-09 15:32:19 -06:00
Wyatt Johnson	3649605629	Merge branch 'master' into auth-tokens	2017-05-09 15:21:38 -06:00
Wyatt Johnson	0d47ee895c	removed unused service	2017-05-09 15:02:31 -06:00
Wyatt Johnson	2e1bc8d75a	Adjusted query/tag flow	2017-05-09 15:01:01 -06: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
Kim Gardner	fa8d96b6be	Merge branch 'master' into edit-comment	2017-05-09 14:19:50 -04:00
Kim Gardner	d8e7b25d0e	Merge pull request #576 from coralproject/FE_Plugin_DOCS ... FE Plugin Docs cleanup	2017-05-09 13:49:49 -04:00
Belen Curcio	52b0819e78	Adding example for plugins within the Admin Comment Queue	2017-05-09 14:02:35 -03:00
Benjamin Goering	994b5006b6	Merge branch 'master' into edit-comment	2017-05-09 09:12:14 -07:00
riley	a187472d5c	merge master	2017-05-09 10:11:04 -06:00
Kim Gardner	a20bacd78d	Merge branch 'master' into FE_Plugin_DOCS	2017-05-09 12:07:27 -04:00
Riley Davis	084f6b28ed	merge master	2017-05-09 10:06:41 -06:00
Kim Gardner	87bc3e0a72	Merge pull request #565 from coralproject/approve-reject-noop ... Don't redo actions on comments	2017-05-09 12:06:21 -04: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
Kim Gardner	42db896d33	Merge branch 'master' into FE_Plugin_DOCS	2017-05-09 08:09:36 -04:00
Kim Gardner	c0b526e98d	Fix typo	2017-05-09 08:03:18 -04:00
Belen Curcio	743580fd08	Merge branch 'coral-reaction' of github.com:coralproject/talk into coral-reaction	2017-05-09 09:02:32 -03:00
Belen Curcio	788610a5f6	Like button params	2017-05-09 09:02:04 -03:00
Kim Gardner	3129828f83	Merge pull request #575 from coralproject/suspect-partial ... do not highlight partial word matches in admin since this is not how the backend works	2017-05-09 07:53:11 -04:00
Belén Curcio	58ce5d5055	Merge branch 'master' into coral-reaction	2017-05-09 08:52:04 -03:00