8775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
gaba	6974f30c73	Merge branch 'master' into ban-user	2016-11-28 12:11:46 -08:00
David ErwinandGitHub	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 DavisandGitHub	98c6ef5162	Merge branch 'master' into config-auth-fix	2016-11-28 11:30:28 -07:00
Wyatt JohnsonandDan Zajdband	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 ErwinandGitHub	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 ErwinandGitHub	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 JohnsonandGitHub	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 ErwinandGitHub	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 ErwinandGitHub	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 ErwinandGitHub	6663e59fb3	Merge branch 'master' into issue-89	2016-11-25 10:36:36 -05:00
David ErwinandGitHub	ec746f1ba1	Merge pull request #93 from coralproject/authorization ... Added authorization pieces + test functions	2016-11-25 10:36:17 -05:00
David ErwinandGitHub	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
gaba	e5c02c4274	The field is action_type and not action.	2016-11-22 17:14:24 -08:00
Wyatt JohnsonandGitHub	29a8b686b3	Merge branch 'master' into authorization	2016-11-22 17:23:14 -07:00
Wyatt Johnson	325162cb3e	Added authorization pieces + test functions	2016-11-22 17:15:14 -07:00
Wyatt JohnsonandGitHub	78f751344a	Update PULL_REQUEST_TEMPLATE.md	2016-11-22 17:01:48 -07:00
David JayandGitHub	a06d1d4bbb	Merge branch 'master' into stream-e2e	2016-11-22 18:58:54 -05:00
David Jay	9a98ccc846	Commenting out blocked tests and log statements.	2016-11-22 18:48:45 -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	ef2eef8b7f	Merge branch 'ban-user' of github.com:coralproject/talk into ban-user	2016-11-22 14:52:52 -08:00
gaba	822e13914a	Fix changeStatus	2016-11-22 14:52:43 -08:00
Kim GardnerandGitHub	30547ad2ff	Merge pull request #88 from coralproject/reply-update ... Reply update	2016-11-22 17:18:12 -05:00