40 Commits

Author	SHA1	Message	Date
David Erwin	e632632754	Merging and updating tests	2016-11-10 12:16:58 -05:00
David Erwin	a234eeb3ba	Add json header, update status, and lint	2016-11-10 10:49:55 -05:00
David Erwin	465437b04a	Merge branch 'master' into actions-working	2016-11-10 10:26:49 -05:00
David Jay	b50c22a414	Merge branch 'master' of https://github.com/coralproject/talk into reader-flags	2016-11-09 22:44:12 -05:00
David Erwin	9856c377eb	Merge branch 'master' into update-settings-in-ui	2016-11-09 17:34:25 -05:00
Dan Zajdband	99f0e77ce1	add(coral-admin): Working actions	2016-11-09 17:27:44 -05:00
David Erwin	777dd9d4ed	Merge branch 'update-settings-in-ui' of https://github.com/coralproject/talk into update-settings-in-ui	2016-11-09 17:13:27 -05:00
David Erwin	decb6747fd	Comment out inactive Settings options	2016-11-09 17:12:52 -05:00
gaba	d7ea18cba9	Fix linting problems. Remove comment of code. Add package.	2016-11-09 13:52:47 -08:00
David Erwin	ef0016dbc1	Merge in master and lint	2016-11-09 16:30:30 -05:00
David Erwin	c2f450d969	Merging master and linting	2016-11-09 14:37:23 -05:00
David Erwin	dc981a93a6	Merging in master	2016-11-09 13:58:19 -05:00
Wyatt Johnson	eb146f286b	Merge branch 'master' into client-eslint	2016-11-09 11:16:21 -07:00
David Jay	1e2f377329	Updating copied text padding.	2016-11-09 13:13:25 -05:00
Belen Curcio	3dcfb58134	Merge branch 'master' of github.com:coralproject/talk into flagging-adapt-api	2016-11-09 13:08:26 -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
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
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	86350800c2	Merge branch 'master' of github.com:coralproject/talk into community	2016-11-08 17:43:00 -03: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
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	1508eac92d	Removing divs from routes	2016-11-08 15:51:43 -03:00
David Jay	ee33b8445b	Adding embed script to appropriate screen in settings.	2016-11-08 12:56:22 -05:00
Riley Davis	ed509ad36b	build from root. routes in coral-admin menu work	2016-11-08 09:13:04 -07:00
Dan Zajdband	018784d725	fix(coral-admin): building, no css	2016-11-07 16:26:49 -05:00
Dan Zajdband	53af608419	fix(coral-admin): Adapt to the new schema. Most things are not working yet but at least it bundles	2016-11-07 11:57:34 -05:00
Dan Zajdband	0d4b8ef748	Added coral admin	2016-11-03 11:52:28 +01:00