35 Commits

Author	SHA1	Message	Date
David Jay	b93ad47dca	Switching to local webpack.	2016-11-07 16:33:56 -05:00
David Jay	c8bdecbd1b	Merge branch 'master' of https://github.com/coralproject/talk into post-comment	2016-11-07 16:29:06 -05:00
gaba	03e5242dcf	Merge branch 'master' into comment-api-implementation	2016-11-07 12:22:31 -08:00
David Jay	e5c04b5fd1	Updating routes and adding dev webpack to package.json	2016-11-07 13:51:40 -05:00
David Erwin	2ff6bcf85d	Merging master into asset	2016-11-07 12:00:28 -05:00
David Erwin	a6b2215a4b	Implement asset tests	2016-11-05 11:14:21 -04:00
David Erwin	c80282dd91	Implement asset upsert and find	2016-11-04 22:24:06 -04:00
gaba	3c8f310987	Merge branch 'master' into comment-api	2016-11-04 14:58:46 -07:00
Wyatt Johnson	c4de906e01	Bumped version of node to 7.0.0	2016-11-04 15:36:29 -06:00
gaba	bbe086df69	Merge branch 'master' into comment-api	2016-11-04 14:18:04 -07:00
Kim Gardner	b29a9a1c24	Merge branch 'master' into comment-api	2016-11-04 16:49:29 -04:00
Wyatt Johnson	a674f48879	Merge branch 'master' into docker-compose	2016-11-04 14:33:20 -06:00
Wyatt Johnson	b17854735e	Initial commit of deployment code	2016-11-04 14:24:23 -06:00
gaba	8cea206dd8	Add chai-http for tests. Simplify route for comments	2016-11-04 13:21:55 -07:00
Riley Davis	2af57b9ab0	Merge branch 'master' into parse-body-send-json	2016-11-04 11:00:03 -06:00
David Jay	8e9ebfb1a9	Adding find functions and tests to user and action models.	2016-11-03 17:45:37 -07:00
David Jay	df77ee963a	Adding find functions and tests to comment model.	2016-11-03 17:06:15 -07:00
Riley Davis	7facdf0840	make the settings routes actually work	2016-11-03 16:34:01 -06:00
David Jay	2faafd9b89	Merge branch 'master' into mock-stream-endpoint ... # Conflicts: # package.json	2016-11-02 15:46:48 -07:00
David Jay	e805573bd4	Adding build script to package.json	2016-11-02 15:45:52 -07:00
Belen Curcio	ed7bf1cc0b	Merge branch 'master' of github.com:coralproject/talk into enh-test	2016-11-02 15:08:16 -03:00
Belen Curcio	265be1898d	Adding mock test	2016-11-02 09:57:18 -03:00
Belen Curcio	f1469d0dbc	Merge branch 'master' of github.com:coralproject/talk into enh-test	2016-11-02 09:12:47 -03:00
Belen Curcio	61e9e30ac5	Adding test script	2016-11-02 09:02:34 -03:00
Belen Curcio	ac80d2683d	Adding eslint as devDep	2016-11-02 08:58:31 -03:00
Belen Curcio	f64d6d293a	running lint before commiting	2016-11-02 08:54:33 -03:00
David Jay	b405394d61	Adding mock comments	2016-11-01 15:06:09 -07:00
David Jay	a5e263e750	Updating queries to mono host and adding start script	2016-11-01 14:19:33 -07:00
David Jay	79dcac5725	Adding coral-embed-stream and dependencies	2016-11-01 13:50:49 -07:00
Wyatt Johnson	98e0a404eb	Updates for merging server down	2016-11-01 11:54:30 -06:00
Belen Curcio	aa2b2d498f	lint	2016-11-01 12:18:00 -03:00
Wyatt Johnson	3c3d0640cf	Added initial dockerfile	2016-11-01 08:42:09 -06:00
Belen Curcio	c2c4c0583b	Cleaned up dependencies package.json	2016-11-01 09:33:04 -03:00
Wyatt Johnson	4963d1f05c	Wrapped server routes into path based managment style	2016-10-31 16:09:04 -06:00
David Erwin	d5da63ece2	Initial commit	2016-10-31 12:17:24 -04:00