625 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Belen Curcio	55afe36e3b	Renaming	2016-11-29 06:24:13 -03: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
Belen Curcio	67d9bc2e3a	Disable selection	2016-11-28 17:36:35 -03:00
Riley Davis	a9e2217e29	Merged branch master into bio	2016-11-28 13:21:53 -07:00
David ErwinandGitHub	109b35951e	Merge pull request #102 from coralproject/config-auth-fix ... Config auth fix	2016-11-28 15:11:19 -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
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
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
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
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
Kim GardnerandGitHub	30547ad2ff	Merge pull request #88 from coralproject/reply-update ... Reply update	2016-11-22 17:18:12 -05: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 JayandGitHub	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
Gabriela Rodríguez BerónandGitHub	32d715e784	Merge pull request #86 from coralproject/fix-icon ... Icon was missing	2016-11-22 12:44:23 -08:00
gaba	1eb2d04136	Icon was missing	2016-11-22 12:35:43 -08:00
Gabriela Rodríguez BerónandGitHub	d5d02aef32	Merge pull request #79 from coralproject/user-integration ... User integration	2016-11-22 09:30:27 -08:00
David JayandGitHub	2e54a51678	Merge branch 'master' into user-integration	2016-11-22 12:09:29 -05:00
Wyatt JohnsonandGitHub	ed6a421609	Merge pull request #83 from coralproject/fixes ... Added fixes for prod	2016-11-22 09:32:51 -07:00
Wyatt Johnson	8eacb01484	Added fixes for prod	2016-11-22 09:31:54 -07:00
David Jay	5c532dab5e	Merge branch 'master' of https://github.com/coralproject/talk into user-integration	2016-11-22 11:11:52 -05:00
Wyatt JohnsonandGitHub	9ecb95dc71	Merge pull request #82 from coralproject/admin ... Admin/User Permissions	2016-11-22 08:36:10 -07:00
Wyatt JohnsonandGitHub	00a8c59c96	Merge branch 'master' into admin	2016-11-22 08:31:21 -07:00
Wyatt Johnson	5b4b9c544e	Removed .idea folder	2016-11-22 08:15:38 -07:00