24 Commits

Author	SHA1	Message	Date
Wyatt Johnson	3c903ddd6d	Merge branch 'master' into stream-e2e	2016-11-29 10:41:50 -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
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 Jay	3030bf4f22	Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e	2016-11-22 15:04:36 -05:00
David Jay	dd060c5fd1	Signing in via e2e and posting comment.	2016-11-21 21:23:48 -05:00
Riley Davis	ae1002fbbf	update to root url	2016-11-21 16:36:07 -07:00
Riley Davis	a0469301bb	add password reset form	2016-11-21 16:32:07 -07:00
Belen Curcio	b1824cdc01	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-18 06:08:23 -03:00
Belen Curcio	c967587b95	Pym and Iframe support embed	2016-11-17 11:40:11 -03:00
Belen Curcio	f1320c7f04	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-17 10:54:16 -03:00
Riley Davis	6e932b840e	merge master. load reset password template from a view	2016-11-16 15:32:44 -07:00
David Erwin	9a2eacabb3	Adding faux multi-article functionality	2016-11-16 12:25:33 -05:00
David Erwin	a5b8856905	Add moderation link to sample page	2016-11-16 12:00:46 -05:00
David Jay	4fd41704c0	Moving preview to embed code.	2016-11-15 12:31:30 -05:00
Wyatt Johnson	f6184fddb0	Added facebook login support + redis cache	2016-11-11 12:53:51 -07:00
Wyatt Johnson	6867760099	Initial pass at adding middleware for users	2016-11-10 17:14:33 -07:00
David Erwin	6f7fe6ace7	Add embedding routes and homepage	2016-11-10 17:12:32 -05:00
Belen Curcio	0df83a2d95	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 21:32:32 -03:00
Wyatt Johnson	7d5eae2e2f	Added embed stream preview	2016-11-08 16:21:50 -07:00
Wyatt Johnson	a1fd4d32ba	Added error middleware	2016-11-08 15:53:26 -07:00
Belen Curcio	86350800c2	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 17:43:00 -03:00
Belen Curcio	a36524a55f	merge	2016-11-08 17:21:12 -03:00
Riley Davis	a15d2eade7	add ejs templating and serve coral-admin from /admin	2016-11-08 11:15:08 -07:00