31 Commits

Author	SHA1	Message	Date
gaba	1eb204f822	Merge branch 'master' into ban-user	2016-12-08 13:28:12 -10:00
Wyatt Johnson	bc88cd1e9d	Adjusted promise	2016-12-08 17:23:31 -05:00
gaba	a86b5f84ac	Adds a role option when creating the user.	2016-12-08 12:18:53 -10:00
gaba	413db123c4	Type on comment.	2016-12-08 12:18:19 -10:00
gaba	23c67b4a49	It fix the status change after merging master in.	2016-12-07 16:37:11 -10:00
gaba	0e2a7decd4	Adds ban/unban to cli. Fix ban user in the admin.	2016-12-07 14:55:49 -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
gaba	a375bf638a	Merge branch 'master' into ban-user	2016-11-29 10:42:46 -08:00
Wyatt Johnson	ab46c020d9	Added asset searching	2016-11-28 15:01:13 -07:00
gaba	1ec7435ef4	Merge branch 'master' into ban-user	2016-11-28 11:41:31 -08: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
gaba	7dc7df2601	Merge branch 'master' into ban-user	2016-11-22 09:30:52 -08:00
Wyatt Johnson	7cc311bd81	Added wordlist, cleaned comments api	2016-11-21 11:18:52 -07:00
gaba	7c960e7118	Add ban action.	2016-11-18 13:22:54 -08:00
Wyatt Johnson	e809c479e1	Added all method on user service	2016-11-17 10:30:34 -07:00
gaba	ce2b21b805	Merge branch 'master' into lint-newlines	2016-11-10 15:09:49 -08:00
David Erwin	7a8cb90ebd	Fix port scope bug	2016-11-10 15:28:14 -05:00
Riley Davis	677faebf76	adhere to new linting rules	2016-11-10 13:09:23 -07:00
Riley Davis	c698ae78a7	initialize settings in an init file before app accepts requests	2016-11-10 13:02:52 -07:00
David Erwin	d9dc198d46	Moved chained funcitons to multiple lines	2016-11-10 14:52:05 -05:00
Wyatt Johnson	0646645686	Added new cli interface + users model	2016-11-09 12:51:32 -07:00
Riley Davis	5bef61abe9	let exceptional circumstances be exceptional	2016-11-04 10:26:39 -06:00
Riley Davis	1bab2d3e4e	still throw error	2016-11-04 10:11:13 -06:00
Riley Davis	1876d38089	disconnect mongoose	2016-11-04 10:09:44 -06:00
Belen Curcio	3ea22d0ece	Console Error	2016-11-04 13:02:47 -03:00
Belen Curcio	0cc5bdb04f	throwing	2016-11-04 12:47:56 -03:00
Riley Davis	55825c4e03	just use the mongoose model	2016-11-03 15:21:02 -06:00
Riley Davis	afc3e82d60	update routes and paths. add init script	2016-11-03 13:36:31 -06:00
Wyatt Johnson	98e0a404eb	Updates for merging server down	2016-11-01 11:54:30 -06:00