8775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wyatt Johnson	8369f263fb	Merged webpack files to unified	2016-11-08 15:00:19 -07:00
Belen Curcio	ad1d555574	Removing the watch	2016-11-08 18:51:52 -03:00
Belen Curcio	52fd6c1618	Community route	2016-11-08 18:50:40 -03:00
Belen Curcio	c9453c3c2a	Route nesting	2016-11-08 18:48:43 -03:00
Belen Curcio	285830211f	Updated Links	2016-11-08 18:46:50 -03:00
Belen Curcio	8920a59a92	ádding dev back	2016-11-08 18:25:54 -03:00
Belen Curcio	ce31161ef9	Production webpack	2016-11-08 18:22:27 -03:00
Belen Curcio	8e449c9023	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 17:50:00 -03:00
Belen Curcio	cba476edfe	removing watch adding webpack const for env vars	2016-11-08 17:49:48 -03:00
Gabriela Rodríguez BerónandGitHub	5270aefe6a	Merge pull request #37 from coralproject/terminology ... Add TERMINOLOGY.md	2016-11-08 12:49:15 -08:00
David Erwin	551ba2ebb3	Add TERMINOLOGY.md	2016-11-08 15:46:00 -05:00
Belen Curcio	86350800c2	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 17:43:00 -03:00
David Jay	e8584b499b	Returning actions, items, and comments as seperate arrays.	2016-11-08 15:32:52 -05:00
David Jay	fcd65c18fd	Switching stream to use action summaries function.	2016-11-08 15:23:04 -05:00
David Jay	d3b8184ff4	Removing randomness from comments api tests.	2016-11-08 15:22:38 -05:00
David Jay	eb00e63a41	Adding action summaries function to actions model.	2016-11-08 15:21:52 -05:00
Belen Curcio	a36524a55f	merge	2016-11-08 17:21:12 -03:00
David ErwinandGitHub	181944e367	Merge pull request #32 from coralproject/embed-link ... Embed link	2016-11-08 14:56:28 -05:00
David ErwinandGitHub	661b402351	Remove npm install from coral-admin build	2016-11-08 14:53:28 -05:00
David ErwinandGitHub	57c63348bd	Merge branch 'master' into embed-link	2016-11-08 14:44:18 -05:00
David ErwinandGitHub	d1b027af27	Merge pull request #35 from coralproject/css-build ... enable css modules	2016-11-08 14:42:08 -05:00
Wyatt Johnson	24c9215dc2	Added circle improvements	2016-11-08 12:39:49 -07:00
Riley DavisandGitHub	15f7f9ee0c	Merge branch 'master' into css-build	2016-11-08 12:38:50 -07:00
Riley Davis	b0b5136b4f	Merged branch css-build into css-build	2016-11-08 12:38:24 -07:00
Riley Davis	1874206dd7	update root package.json	2016-11-08 12:38:16 -07:00
David JayandGitHub	a615356936	Merge pull request #34 from coralproject/update-readme ... Update readme	2016-11-08 14:37:17 -05:00
Belen Curcio	130fc259bf	Cleanup	2016-11-08 16:36:52 -03:00
David Erwin	6c9e31c52d	Drop trailing slash requirement on admin route	2016-11-08 14:36:40 -05:00
Riley Davis	c609e5b3bb	enable css modules	2016-11-08 12:35:37 -07:00
Belen Curcio	b7c0602a2c	Header, Drawer, Layout	2016-11-08 16:32:09 -03:00
Kim Gardner	ff42d571e6	Add trailing slashes to URLs	2016-11-08 14:25:53 -05:00
Kim Gardner	db66c66f3d	Update admin route	2016-11-08 14:23:42 -05:00
Kim Gardner	e3074892ce	Add moderator view URL	2016-11-08 14:23:41 -05:00
Kim Gardner	c7cf2785fd	Update README	2016-11-08 14:23:41 -05:00
Belen Curcio	b18104c8d9	Layout Container and Route handling	2016-11-08 16:19:53 -03:00
David ErwinandGitHub	2baeedeb58	Merge pull request #33 from coralproject/admin-routes ... add ejs templating and serve coral-admin from /admin	2016-11-08 14:15:56 -05:00
Riley DavisandGitHub	23eb24272d	Merge branch 'master' into admin-routes	2016-11-08 12:04:20 -07:00
Riley Davis	80f1f70a2a	hardcode routes in react app	2016-11-08 12:03:49 -07:00
Belen Curcio	ef3a34680a	config for pre git	2016-11-08 15:52:09 -03:00
Belen Curcio	1508eac92d	Removing divs from routes	2016-11-08 15:51:43 -03:00
Gabriela Rodríguez BerónandGitHub	28e6f87b1b	Merge pull request #26 from coralproject/mod-queue ... Mod queue	2016-11-08 10:30:01 -08:00
Riley Davis	6f6da14401	fix build script a bit	2016-11-08 11:27:47 -07:00
gaba	ed01d54418	It fixes random test on get comment by comment_id.	2016-11-08 10:26:35 -08:00
Riley Davis	b2bfadafca	Merged branch admin-routes into admin-routes	2016-11-08 11:25:00 -07:00
Riley Davis	b6355b06db	remove unused var	2016-11-08 11:24:46 -07:00
Riley DavisandGitHub	e56284569a	Merge branch 'master' into admin-routes	2016-11-08 11:20:53 -07:00
Riley Davis	a15d2eade7	add ejs templating and serve coral-admin from /admin	2016-11-08 11:15:08 -07:00
David Erwin	242e64198a	Add autoprefixer to dependencies	2016-11-08 13:09:09 -05:00
David Erwin	2807b2d5b2	Merge master into nod-queue	2016-11-08 13:05:31 -05:00
David JayandGitHub	4a3f16b136	Merge branch 'master' into embed-link	2016-11-08 13:03:14 -05:00