4030 Commits

Author	SHA1	Message	Date
Belen Curcio	a5de52aeb9	merge	2016-11-29 13:57:14 -03:00
Belen Curcio	86faf504bb	changes	2016-11-29 13:56:26 -03:00
David Jay	ea2ee68ed6	Test db clear (#116) ... * Adding headers to stream request. * Switching mongodb when node_env === test.	2016-11-29 11:44:54 -05:00
Belen Curcio	55afe36e3b	Renaming	2016-11-29 06:24:13 -03:00
Wyatt Johnson	29f378b863	Merge branch 'master' into bio	2016-11-28 17:20:58 -07:00
gaba	abedb36791	Merge branch 'master' into ban-user	2016-11-28 16:04:15 -08:00
David Jay	5f2f70fd51	Fixing bug when adding users to redux.	2016-11-28 18:59:27 -05:00
David Jay	aa048365bd	Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix	2016-11-28 18:43:20 -05:00
riley	0e3cd001e9	merge master	2016-11-28 16:38:25 -07:00
Riley Davis	d5ff0f8f28	keep it DRY. add getInit all over the place. update tests	2016-11-28 16:18:19 -07:00
David Jay	79cda54be2	Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix	2016-11-28 17:28:41 -05:00
David Jay	7cf05bbdca	Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream	2016-11-28 17:25:07 -05:00
David Jay	823c223cf1	Adding settings to redux store from stream.	2016-11-28 17:11:37 -05:00
gaba	144e716db9	Merge branch 'master' into ban-user	2016-11-28 13:00:56 -08:00
David Jay	8af300a9ec	Adding users, comments, and actions to endpoint and moving to store.	2016-11-28 15:51:15 -05:00
Belen Curcio	613a165325	merge	2016-11-28 17:40:22 -03:00
Belen Curcio	67d9bc2e3a	Disable selection	2016-11-28 17:36:35 -03:00
Gabriela Rodríguez Berón	31b0453e82	Merge branch 'master' into logout	2016-11-28 12:33:42 -08:00
gaba	6974f30c73	Merge branch 'master' into ban-user	2016-11-28 12:11:46 -08:00
Riley Davis	25d53116f7	remove unused var	2016-11-28 12:49:29 -07:00
gaba	1ec7435ef4	Merge branch 'master' into ban-user	2016-11-28 11:41:31 -08:00
Belen Curcio	d384a69111	Main Tabs	2016-11-28 15:56:14 -03:00
Riley Davis	0d7014f77a	add helpers to talk-adapter	2016-11-28 11:50:25 -07:00
Riley Davis	98c6ef5162	Merge branch 'master' into config-auth-fix	2016-11-28 11:30:28 -07:00
Wyatt Johnson	b0f01cf00f	Initial commit of asset queuing (#97) ... * Initial commit of asset queuing * Addresssing comments	2016-11-28 13:29:39 -05:00
Riley Davis	ee0e0ea9ed	import belen's fetch helpers	2016-11-28 11:17:41 -07:00
Riley Davis	c0eb202858	small refactor on items actions	2016-11-28 10:57:15 -07:00
Riley Davis	d10870c6bb	dispatch update for adding comemnts	2016-11-28 10:54:10 -07:00
Belen Curcio	1dc7db9081	Structure	2016-11-28 14:43:43 -03:00
Belen Curcio	5bb386e16a	Structure	2016-11-28 14:25:30 -03:00
Belen Curcio	4d916be170	Working tabs	2016-11-27 20:54:41 -03:00
Belen Curcio	3ebdca33f3	Logout func	2016-11-27 19:37:17 -03:00
Riley Davis	28520bfd4a	add get comments by user endpoint. refactor getStream to be functional programming	2016-11-23 17:14:51 -07:00
Riley Davis	71d4ddf030	create comment history class	2016-11-23 13:28:20 -07:00
gaba	e9fdb2cc00	Merge branch 'issue-89' into ban-user	2016-11-22 17:20:53 -08:00
gaba	e5c02c4274	The field is action_type and not action.	2016-11-22 17:14:24 -08:00
David Jay	a06d1d4bbb	Merge branch 'master' into stream-e2e	2016-11-22 18:58:54 -05:00
David Jay	5ab3fba818	Setting env variables properly in tests.	2016-11-22 18:45:11 -05:00
gaba	a192c08496	Merge branch 'master' into ban-user	2016-11-22 14:53:13 -08:00
gaba	822e13914a	Fix changeStatus	2016-11-22 14:52:43 -08:00
David Jay	6e6ba89706	Hiding reply box on post.	2016-11-22 16:51:22 -05:00
David Jay	dea62d8895	Fixing bug with reply author name.	2016-11-22 16:16:10 -05:00
David Jay	0d4a029529	Merge pull request #87 from coralproject/add-https-to-script ... Adds https and accessibility to embed code.	2016-11-22 16:13:53 -05:00
David Jay	d04812fd36	Adding https and accessability to embed code.	2016-11-22 16:09:36 -05:00
gaba	1eb2d04136	Icon was missing	2016-11-22 12:35:43 -08:00
David Jay	3030bf4f22	Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e	2016-11-22 15:04:36 -05:00
David Jay	654e3580e7	Adding second test.	2016-11-22 13:49:21 -05:00
gaba	f7c4e8bf24	Merge branch 'master' into ban-user	2016-11-22 09:35:06 -08:00
gaba	7dc7df2601	Merge branch 'master' into ban-user	2016-11-22 09:30:52 -08:00
David Jay	2e54a51678	Merge branch 'master' into user-integration	2016-11-22 12:09:29 -05:00