97 Commits

Author	SHA1	Message	Date
Riley Davis	f2ded3f2a7	replace things multiple times	2016-12-06 14:34:27 -10:00
Riley Davis	31c87cb93f	make the translation function accept n arguments. ninja bugfix to permalink	2016-12-06 14:17:01 -10:00
Riley Davis	f2c751f9f0	Merge branch 'master' into i18n-var	2016-12-06 13:41:44 -10:00
Belen Curcio	08e232c4fe	User Should still be able to see sign info even if its closed // moving comp	2016-12-05 19:28:47 -03:00
Belen Curcio	03b6ec4fe4	Lint	2016-12-05 19:18:29 -03:00
Dan Zajdband	62cc489c21	Merge with master	2016-12-05 16:39:00 -05:00
Dan Zajdband	4be258c63d	Added simple open/close flow	2016-12-05 11:02:39 -05:00
gaba	60d4793111	Adds a variable to the possible translations.	2016-12-02 16:12:24 -08:00
Belen Curcio	990782a542	Sign in a restricted rout	2016-12-01 11:17:07 -03:00
Belen Curcio	c38c556002	merge	2016-11-30 20:11:22 -03:00
Belen Curcio	d90a158298	Bio Tooltips	2016-11-30 17:09:34 -03:00
Belen Curcio	6e7926ab30	Working bios	2016-11-30 12:41:50 -03:00
Belen Curcio	2607c608f5	D ... ividing userData from userAuth	2016-11-30 10:20:03 -03:00
Belen Curcio	bd704bf2ce	User Settings, Restricted User, Banned User, Bio and User actions and Reducers	2016-11-30 08:42:25 -03:00
Riley Davis	3e86bfdceb	false positive on user signed in	2016-11-29 15:58:05 -07:00
Riley Davis	a7f94fce83	implement coralApi fetch	2016-11-29 14:44:37 -07:00
Riley Davis	8218d0c18e	Merge branch 'master' into bio	2016-11-29 10:36:20 -07:00
Belen Curcio	a5de52aeb9	merge	2016-11-29 13:57:14 -03:00
Belen Curcio	86faf504bb	changes	2016-11-29 13:56:26 -03:00
David Jay	ea2ee68ed6	Test db clear (#116) ... * Adding headers to stream request. * Switching mongodb when node_env === test.	2016-11-29 11:44:54 -05:00
Wyatt Johnson	29f378b863	Merge branch 'master' into bio	2016-11-28 17:20:58 -07:00
riley	0e3cd001e9	merge master	2016-11-28 16:38:25 -07:00
Riley Davis	d5ff0f8f28	keep it DRY. add getInit all over the place. update tests	2016-11-28 16:18:19 -07:00
David Jay	7cf05bbdca	Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream	2016-11-28 17:25:07 -05:00
David Jay	823c223cf1	Adding settings to redux store from stream.	2016-11-28 17:11:37 -05:00
Belen Curcio	613a165325	merge	2016-11-28 17:40:22 -03:00
Belen Curcio	d384a69111	Main Tabs	2016-11-28 15:56:14 -03:00
Riley Davis	98c6ef5162	Merge branch 'master' into config-auth-fix	2016-11-28 11:30:28 -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
Riley Davis	c0eb202858	small refactor on items actions	2016-11-28 10:57:15 -07:00
Belen Curcio	5bb386e16a	Structure	2016-11-28 14:25:30 -03:00
Belen Curcio	4d916be170	Working tabs	2016-11-27 20:54:41 -03: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 Johnson	00a8c59c96	Merge branch 'master' into admin	2016-11-22 08:31:21 -07:00
David Jay	1931c85d67	Merging	2016-11-21 19:23:29 -05:00
David Jay	06686105c4	Merge branch 'master' into connect-reset-to-fe	2016-11-21 19:06:04 -05:00
David Jay	2b9caf8daf	Updating frontend to utilize new action delete endpoint.	2016-11-21 18:00:50 -05:00
David Jay	1a648ca20e	Simplifying item references in CommentStream.	2016-11-21 17:12:55 -05:00
David Jay	c6b1e5a800	Adding frontend IDs to facilitate management of actions.	2016-11-21 16:54:01 -05:00
Bel	fa190b4b3e	CoralLogo added to Coral-UI as SVG. and Admin session	2016-11-21 18:30:12 -03:00
Wyatt Johnson	7cc311bd81	Added wordlist, cleaned comments api	2016-11-21 11:18:52 -07:00
David Jay	a4a8b97873	Including author name when comments are first posted.	2016-11-18 23:15:41 -05:00
Riley Davis	506c514799	request pw reset from ui	2016-11-18 15:09:13 -07:00
Belen Curcio	6e75b03d6b	Empty states, validation and removing availability	2016-11-18 07:41:46 -03:00
Belen Curcio	b1824cdc01	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-18 06:08:23 -03:00
Belen Curcio	6f02450c94	Changes and translations	2016-11-17 16:21:13 -03:00
Belen Curcio	a2dd08fc98	Forgot Password endpoint	2016-11-17 11:43:10 -03:00
Belen Curcio	c967587b95	Pym and Iframe support embed	2016-11-17 11:40:11 -03:00
Belen Curcio	a8f28f64b7	Merge Issues	2016-11-17 11:00:35 -03:00
Belen Curcio	f1320c7f04	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-17 10:54:16 -03:00