4030 Commits

Author	SHA1	Message	Date
Belen Curcio	3dcfb58134	Merge branch 'master' of github.com:coralproject/talk into flagging-adapt-api	2016-11-09 13:08:26 -03:00
Dan Zajdband	4d0bacafd3	Merge branch 'master' into flagging-adapt-api	2016-11-09 10:46:50 -05:00
Belen Curcio	0df83a2d95	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 21:32:32 -03:00
David Jay	418b1529ed	Updating copying style to match designs.	2016-11-08 19:18:26 -05:00
Wyatt Johnson	d8ec009482	Added linting to the client	2016-11-08 17:16:24 -07:00
riley	843f90baea	merge master	2016-11-08 16:22:05 -07:00
Riley Davis	c6188913d8	display a simple error text	2016-11-08 16:19:40 -07:00
Riley Davis	ff52714f27	update state correctly. save to server correctly	2016-11-08 16:16:27 -07:00
David Jay	d7ead01180	Expecting stream endpoint to return items broken out by type.	2016-11-08 17:53:38 -05:00
Belen Curcio	8fd7a46d37	removed log	2016-11-08 19:52:37 -03:00
Belen Curcio	4b7b8336ad	Env vars	2016-11-08 19:42:58 -03:00
Belen Curcio	6738ff86e1	changes	2016-11-08 19:35:56 -03:00
Riley Davis	2823232c12	add actions and reducers for settings	2016-11-08 15:25:48 -07:00
Dan Zajdband	8c215e0861	api-adapt(coral-admin): Get flagging mod queue working with the backend	2016-11-08 17:15:57 -05:00
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	cba476edfe	removing watch adding webpack const for env vars	2016-11-08 17:49:48 -03: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
David Erwin	661b402351	Remove npm install from coral-admin build	2016-11-08 14:53:28 -05:00
David Erwin	57c63348bd	Merge branch 'master' into embed-link	2016-11-08 14:44:18 -05:00
Belen Curcio	130fc259bf	Cleanup	2016-11-08 16:36:52 -03: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
Belen Curcio	b18104c8d9	Layout Container and Route handling	2016-11-08 16:19:53 -03: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
Riley Davis	a15d2eade7	add ejs templating and serve coral-admin from /admin	2016-11-08 11:15:08 -07:00
David Jay	7e72046481	Adding npm install to build process for coral-admin so build works.	2016-11-08 12:57:16 -05:00
David Jay	ee33b8445b	Adding embed script to appropriate screen in settings.	2016-11-08 12:56:22 -05:00
David Jay	411e6e48f3	Removing unused copy from build process.	2016-11-08 12:28:09 -05:00
David Erwin	4fcbead158	Merge branch 'master' into one-build	2016-11-08 11:34:59 -05:00
Riley Davis	ed509ad36b	build from root. routes in coral-admin menu work	2016-11-08 09:13:04 -07:00
David Jay	33c77178a9	Fixing id bug in redux store.	2016-11-07 18:41:23 -05:00
David Jay	e7f4f82f66	Fixing comment post order bug.	2016-11-07 18:41:07 -05:00
David Jay	456524e4ee	Adding multiline comments.	2016-11-07 18:09:26 -05:00
David Jay	47bcd163b1	Showing comments in chronological order.	2016-11-07 17:56:44 -05:00
David Jay	f1f051e63f	Copying over files in dev webpack	2016-11-07 17:29:49 -05:00
Riley Davis	686d39c47b	merge master	2016-11-07 15:28:20 -07:00
David Jay	4f33818153	Posting items in reverse chronological order.	2016-11-07 17:12:20 -05:00
David Jay	c5d15eed77	Fixing bug in reply counting.	2016-11-07 16:54:52 -05:00
David Jay	3bdd1893e0	Commenting out flag button.	2016-11-07 16:48:57 -05:00
David Jay	9c3957ad40	Getting pym via https	2016-11-07 16:47:03 -05:00
David Jay	c8bdecbd1b	Merge branch 'master' of https://github.com/coralproject/talk into post-comment	2016-11-07 16:29:06 -05:00