94 Commits

Author	SHA1	Message	Date
Wyatt Johnson	aaebbabef9	Revert "Revert "Status history""	2016-12-08 16:12:44 -05:00
David Erwin	9ea6c66744	Revert "Status history"	2016-12-08 10:59:56 -10:00
Wyatt Johnson	d2d4640eee	Merge branch 'master' into status-history	2016-12-06 11:08:00 -05:00
Wyatt Johnson	2f7f0249b2	Added status changing + history ... - Status's for comments is now an array of objects	2016-12-05 11:28:27 -05:00
David Jay	a118d263ea	Cleaning url regex in commentstream.	2016-12-01 16:23:33 -05:00
Wyatt Johnson	3c903ddd6d	Merge branch 'master' into stream-e2e	2016-11-29 10:41:50 -07:00
Wyatt Johnson	ab46c020d9	Added asset searching	2016-11-28 15:01:13 -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
David Jay	5ab3fba818	Setting env variables properly in tests.	2016-11-22 18:45:11 -05:00
David Jay	3030bf4f22	Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e	2016-11-22 15:04:36 -05:00
David Jay	769eba4515	Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e	2016-11-21 15:29:48 -05:00
David Jay	15810e3ece	Running comment post test w/ proper settings.	2016-11-21 15:27:31 -05: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	7cc311bd81	Added wordlist, cleaned comments api	2016-11-21 11:18:52 -07:00
Dan Zajdband	1134e3bc09	add(coral-admin): Syntax highlighting on links	2016-11-18 10:46:09 -05:00
Wyatt Johnson	c4ba18778c	Merge branch 'master' into passport	2016-11-17 14:26:52 -07:00
Wyatt Johnson	68c689f95d	Added missing dep	2016-11-17 10:26:51 -07:00
Belen Curcio	f1320c7f04	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-17 10:54:16 -03:00
Belen Curcio	60c17fc973	Ádding Debouncing for CheckAvailability, Valid Check form and Styling	2016-11-16 20:56:05 -03:00
David Jay	d389680224	Utilizing test db for e2e tests.	2016-11-16 17:18:17 -05:00
riley	e027a162d6	remove sendgrid shim and use connection string	2016-11-16 14:00:33 -07:00
riley	fa8036ac3f	merge master	2016-11-16 11:58:01 -07:00
David Jay	af76e65246	Posting comment in e2e test.	2016-11-16 13:43:36 -05:00
Riley Davis	c86e1e8d47	create and decode jwt	2016-11-15 16:21:25 -07:00
Wyatt Johnson	721c041332	Added fix for webpack building	2016-11-15 13:33:02 -07:00
Riley Davis	eabce87f99	Merged branch master into password-reset	2016-11-15 12:34:43 -07:00
Dan Zajdband	223887616d	feature(coral-admin): Add users role change	2016-11-14 16:20:56 -05:00
Riley Davis	c1271d4d1b	mailer module v1	2016-11-14 13:31:47 -07:00
Riley Davis	7d9b24c5b9	start adding mail settings	2016-11-14 10:44:33 -07:00
Belen Curcio	f14353d464	SignIn Dialog	2016-11-12 00:12:54 -03:00
Belen Curcio	c72e504af8	Merge branch 'master' of github.com:coralproject/talk into passport	2016-11-11 19:43:49 -03:00
Riley Davis	e2735759a6	first pass at permalink box	2016-11-11 11:27:39 -07:00
Wyatt Johnson	6867760099	Initial pass at adding middleware for users	2016-11-10 17:14:33 -07:00
David Erwin	e632632754	Merging and updating tests	2016-11-10 12:16:58 -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
Wyatt Johnson	42a7eee1a2	Merge branch 'master' into auth	2016-11-09 16:28:39 -07:00
Wyatt Johnson	c203bf16eb	Improved tests and fixed them for new users model	2016-11-09 16:26:23 -07:00
David Erwin	9856c377eb	Merge branch 'master' into update-settings-in-ui	2016-11-09 17:34:25 -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
Wyatt Johnson	ef22da5f29	Merge branch 'master' into auth	2016-11-09 12:52:09 -07:00
Wyatt Johnson	0646645686	Added new cli interface + users model	2016-11-09 12:51:32 -07:00
David Jay	e0e80aa5cd	Moving coral-framework tests over and updating mocha to transpile them.	2016-11-09 14:10:01 -05:00
Wyatt Johnson	eb146f286b	Merge branch 'master' into client-eslint	2016-11-09 11:16:21 -07:00
Wyatt Johnson	f708271d00	Added missing babel plugin	2016-11-09 09:03:25 -07:00
Wyatt Johnson	e638d2785b	Some dep fixes which will hopefully resolve the CI issues	2016-11-09 07:53:34 -07:00
Wyatt Johnson	d8ec009482	Added linting to the client	2016-11-08 17:16:24 -07:00
Wyatt Johnson	8369f263fb	Merged webpack files to unified	2016-11-08 15:00:19 -07:00
David Erwin	57c63348bd	Merge branch 'master' into embed-link	2016-11-08 14:44:18 -05:00