554 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wyatt Johnson	8eacb01484	Added fixes for prod	2016-11-22 09:31:54 -07:00
Wyatt Johnson	9ecb95dc71	Merge pull request #82 from coralproject/admin ... Admin/User Permissions	2016-11-22 08:36:10 -07:00
Wyatt Johnson	00a8c59c96	Merge branch 'master' into admin	2016-11-22 08:31:21 -07:00
Wyatt Johnson	5b4b9c544e	Removed .idea folder	2016-11-22 08:15:38 -07:00
Belen Curcio	8108ca09ef	Permissions, views and somestyling	2016-11-22 11:04:56 -03:00
Belen Curcio	c8d7585e90	Added FabButton to CoralUI	2016-11-22 09:34:46 -03:00
Belen Curcio	6e6681a553	Styles and refactor errors	2016-11-22 09:08:08 -03:00
Belen Curcio	f7daa35c41	Active Routes	2016-11-22 08:32:26 -03:00
Bel	b74a1bece3	Link Routes	2016-11-22 08:10:46 -03:00
David Jay	715e40f020	Merge pull request #81 from coralproject/connect-reset-to-fe ... Connect reset to fe	2016-11-21 19:17:18 -05:00
David Jay	06686105c4	Merge branch 'master' into connect-reset-to-fe	2016-11-21 19:06:04 -05:00
David Jay	d355211a53	Merge pull request #80 from coralproject/wordlist ... Wordlist	2016-11-21 18:49:33 -05:00
Riley Davis	8a1c9ce44e	Merged branch master into connect-reset-to-fe	2016-11-21 16:36:40 -07: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
David Jay	2b9caf8daf	Updating frontend to utilize new action delete endpoint.	2016-11-21 18:00:50 -05:00
Bel	fa190b4b3e	CoralLogo added to Coral-UI as SVG. and Admin session	2016-11-21 18:30:12 -03:00
Wyatt Johnson	642e05f999	Merge branch 'master' into wordlist	2016-11-21 14:18:16 -07:00
Andrew Losowsky	1ab2e061eb	added word lists	2016-11-21 16:12:07 -05:00
Riley Davis	a375c63cbb	Merged branch master into connect-reset-to-fe	2016-11-21 12:56:43 -07:00
Wyatt Johnson	a45a5f7296	Updated test to verify middleware is working	2016-11-21 12:49:04 -07:00
Wyatt Johnson	cab9ec3e52	Fixed package.json	2016-11-21 12:45:08 -07:00
Wyatt Johnson	3abd6cabac	Merge branch 'master' into wordlist	2016-11-21 12:44:08 -07:00
Wyatt Johnson	7893d425ef	Updated tests	2016-11-21 12:42:42 -07:00
Wyatt Johnson	7cc311bd81	Added wordlist, cleaned comments api	2016-11-21 11:18:52 -07:00
Gabriela Rodríguez Berón	2160a81b7b	Merge pull request #74 from coralproject/added-link-highlighting ... add(coral-admin): Syntax highlighting on links	2016-11-18 20:38:35 -08:00
Riley Davis	506c514799	request pw reset from ui	2016-11-18 15:09:13 -07:00
Dan Zajdband	0f7d758336	fix(coral-admin): Linted code	2016-11-18 15:12:59 -05:00
Dan Zajdband	ee9dc7260f	add(coral-admin): Added cointains link warning	2016-11-18 12:15:53 -05:00
Dan Zajdband	1134e3bc09	add(coral-admin): Syntax highlighting on links	2016-11-18 10:46:09 -05:00
Gabriela Rodríguez Berón	d9f1c05216	Merge pull request #64 from coralproject/passport ... Auth	2016-11-18 03:41:07 -08: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
Wyatt Johnson	c4ba18778c	Merge branch 'master' into passport	2016-11-17 14:26:52 -07:00
Riley Davis	8184fdf581	Merge pull request #71 from coralproject/password-reset ... reset password endpoints	2016-11-17 13:32:08 -07:00
Belen Curcio	36a4f9d2d2	Merge branch 'passport' of github.com:coralproject/talk into passport	2016-11-17 16:22:19 -03:00
Belen Curcio	6f02450c94	Changes and translations	2016-11-17 16:21:13 -03:00
Riley Davis	145bb68681	don't use this keyword in UserService methods	2016-11-17 11:31:27 -07:00
Riley Davis	869d871157	always return 204 for password reset. update swagger file	2016-11-17 11:25:19 -07:00
Belen Curcio	9df1da7a5d	changes	2016-11-17 14:59:58 -03:00
Wyatt Johnson	598b4d8bb1	Improved error handling to add logging	2016-11-17 10:36:07 -07:00
Riley Davis	04decde9fc	throw instead of log errors. rename for clarity	2016-11-17 10:31:46 -07:00
Wyatt Johnson	e809c479e1	Added all method on user service	2016-11-17 10:30:34 -07:00
Wyatt Johnson	68c689f95d	Added missing dep	2016-11-17 10:26:51 -07:00
Wyatt Johnson	73c681b98f	Added missing service function	2016-11-17 10:20:29 -07:00
Belen Curcio	21f83c6f9a	Removing add Name	2016-11-17 11:54:15 -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	032de329a6	Linting	2016-11-17 11:19:56 -03:00
Belen Curcio	da1539422b	Using User Interface	2016-11-17 11:18:17 -03:00