3586 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wyatt Johnson	1110cd9582	Merge pull request #106 from coralproject/kue-redis-fix ... Moved kue redis connector	2016-11-28 14:14:15 -07:00
Wyatt Johnson	d882e4965e	Merge branch 'master' into kue-redis-fix	2016-11-28 14:06:47 -07:00
Wyatt Johnson	616dd534d9	Moved kue redis connector	2016-11-28 14:05:06 -07: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	9c3edd2ed5	merge	2016-11-28 17:41:26 -03:00
Belen Curcio	613a165325	merge	2016-11-28 17:40:22 -03:00
Belén Curcio	0cdc010124	Merge pull request #103 from coralproject/logout ... Admin Logout	2016-11-28 17:39:37 -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
Riley Davis	a9e2217e29	Merged branch master into bio	2016-11-28 13:21:53 -07:00
gaba	6974f30c73	Merge branch 'master' into ban-user	2016-11-28 12:11:46 -08:00
David Erwin	109b35951e	Merge pull request #102 from coralproject/config-auth-fix ... Config auth fix	2016-11-28 15:11:19 -05:00
gaba	67d54be0d9	Remove space.	2016-11-28 12:11:05 -08:00
Dan Zajdband	f6e423e945	Fixed linting issues	2016-11-28 15:09:26 -05:00
riley	bd6bc62733	Merged master into bio	2016-11-28 12:49:43 -07: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
Dan Zajdband	552e174b0d	fix(embed): Disabled framing middleware enabling placing the comment box in third-party sites. In the future we will count with a whitelist so we can adjust the middleware	2016-11-28 14:23:22 -05: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
Belen Curcio	6714082b99	master merge	2016-11-28 14:57:16 -03: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
David Erwin	979b55180e	Merge branch 'master' into guides	2016-11-28 12:45:25 -05:00
Belen Curcio	1dc7db9081	Structure	2016-11-28 14:43:43 -03:00
David Erwin	c1a7b95705	Merge pull request #99 from coralproject/upsertting-actions ... Corrected action upserting functionality	2016-11-28 12:34:24 -05:00
Belen Curcio	5bb386e16a	Structure	2016-11-28 14:25:30 -03:00
Wyatt Johnson	b22a76536c	Merge branch 'master' into upsertting-actions	2016-11-28 10:21:03 -07:00
Wyatt Johnson	d34cbc7870	Moved the action insert into the action model.	2016-11-28 10:19:33 -07:00
Wyatt Johnson	9d8968f1ce	Corrected action upserting functionality	2016-11-28 10:14:13 -07: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
David Erwin	2d39dd81e4	Merge pull request #95 from coralproject/deprecate-stream-preview ... Deprecate stream preview	2016-11-25 12:00:51 -05:00
David Erwin	cb31caed4b	Update comments	2016-11-25 11:47:00 -05:00
David Erwin	a022ef8a52	Restore embed/stream.ejs	2016-11-25 10:50:30 -05:00
David Erwin	93cd4ea74c	Remove non-standard stream embed template	2016-11-25 10:43:32 -05:00
David Erwin	7a6ea34468	Remove the preview link	2016-11-25 10:42:38 -05:00
David Erwin	bb8570a3d4	Merge pull request #94 from coralproject/issue-89 ... The field is action_type and not action.	2016-11-25 10:39:44 -05:00
David Erwin	6663e59fb3	Merge branch 'master' into issue-89	2016-11-25 10:36:36 -05:00
David Erwin	ec746f1ba1	Merge pull request #93 from coralproject/authorization ... Added authorization pieces + test functions	2016-11-25 10:36:17 -05:00
David Erwin	c0de7a40c3	Merge branch 'master' into issue-89	2016-11-25 10:31:55 -05: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	66de272c56	typos and such	2016-11-23 13:38:24 -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	8166ae90c9	Merge branch 'master' into ban-user	2016-11-22 17:16:59 -08:00