Commit Graph

8345 Commits

Author SHA1 Message Date
David Erwin 712841679d Linting and clarifying tests 2016-11-05 11:18:18 -04:00
David Erwin a6b2215a4b Implement asset tests 2016-11-05 11:14:21 -04:00
David Erwin 17ccc830d9 Update swagger 2016-11-05 08:54:59 -04:00
David Erwin cb08f139ca Swagger and linting 2016-11-05 08:50:34 -04:00
David Erwin c80282dd91 Implement asset upsert and find 2016-11-04 22:24:06 -04:00
Riley Davis 42c9f60586 Merge pull request #15 from coralproject/comment-api
Comment api
2016-11-04 16:19:08 -06:00
gaba 9916edc127 Adds implementation for get all comments 2016-11-04 15:10:28 -07:00
gaba 9be29b9346 Removes console log. 2016-11-04 14:59:25 -07:00
gaba 3c8f310987 Merge branch 'master' into comment-api 2016-11-04 14:58:46 -07:00
gaba 43a70ea71c Add tests for stream. Move to promises the rightway. 2016-11-04 14:45:46 -07:00
David Erwin 8fc6dd42dc Merge pull request #18 from coralproject/version-bump
Bumped version of node to 7.0.0
2016-11-04 17:37:39 -04:00
Wyatt Johnson c4de906e01 Bumped version of node to 7.0.0 2016-11-04 15:36:29 -06:00
gaba 3cff52d72f It returns an array. Need to check the tests. 2016-11-04 14:32:47 -07:00
gaba 69980c9d7d Simplify concat. 2016-11-04 14:24:04 -07:00
gaba bbe086df69 Merge branch 'master' into comment-api 2016-11-04 14:18:04 -07:00
gaba 7f31d4b9e9 Merge branch 'comment-api' of github.com:coralproject/talk into comment-api 2016-11-04 14:16:25 -07:00
David Erwin f8cafa1331 Merge pull request #17 from coralproject/docker-compose
Fixed invalid command
2016-11-04 17:15:27 -04:00
Wyatt Johnson cad0e3d9f9 Merge branch 'master' into docker-compose 2016-11-04 15:14:53 -06:00
gaba 23ea7025ea Convert from promises to array 2016-11-04 14:13:22 -07:00
Wyatt Johnson 9e07f720da Fixed invalid command 2016-11-04 15:11:20 -06:00
Wyatt Johnson d45eebe536 Merge pull request #16 from coralproject/docker-compose
Docker compose
2016-11-04 14:54:59 -06:00
Kim Gardner b29a9a1c24 Merge branch 'master' into comment-api 2016-11-04 16:49:29 -04:00
gaba ea93687f89 Not sure when I lost the implmenetation of this. 2016-11-04 13:43:03 -07:00
gaba 4836069fb6 Rmeoves console.log 2016-11-04 13:36:35 -07:00
Wyatt Johnson 9956249cae Fixed the filename... 2016-11-04 14:35:05 -06:00
Wyatt Johnson a674f48879 Merge branch 'master' into docker-compose 2016-11-04 14:33:20 -06:00
Wyatt Johnson 6192d7e9fb Merge pull request #11 from coralproject/parse-body-send-json
make the settings routes actually work
2016-11-04 14:31:47 -06:00
gaba 19a7de5c98 Remove validations for now until we really use them. 2016-11-04 13:28:40 -07:00
Wyatt Johnson 1f7f9fd9ba Merge branch 'master' into parse-body-send-json 2016-11-04 14:27:44 -06:00
Wyatt Johnson 09a4bcb213 Added test badge 2016-11-04 14:26:32 -06:00
gaba 65a50ea0ab Merge branch 'master' into comment-api 2016-11-04 13:25:55 -07: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
gaba 141c114138 Get back the timestamps to the user model. 2016-11-04 13:20:58 -07:00
Riley Davis dba1b04558 204 no content 2016-11-04 14:06:02 -06:00
Wyatt Johnson ca0ca56ad9 Merge pull request #14 from coralproject/lint-error
Linting Error
2016-11-04 13:53:54 -06:00
gaba a95bbb5fd0 Merge branch 'master' into comment-api 2016-11-04 11:01:09 -07:00
gaba 7c40e21879 Get comment 2016-11-04 10:51:17 -07:00
gaba 53453644a3 Adds tests with array sorted. 2016-11-04 10:19:42 -07:00
David Jay f321033c0e Merge branch 'comment-api' of https://github.com/coralproject/talk into comment-api 2016-11-04 10:19:24 -07:00
David Jay c173b08387 Fixing inconsistent test in comment model. 2016-11-04 10:16:20 -07:00
gaba 5a2c3b2077 It does not work like this. 2016-11-04 10:12:10 -07:00
gaba 7c3005be50 Remove a test. 2016-11-04 10:07:44 -07:00
Riley Davis c99a7432a8 Merge branch 'master' into lint-error 2016-11-04 11:01:28 -06:00
Riley Davis 2af57b9ab0 Merge branch 'master' into parse-body-send-json 2016-11-04 11:00:03 -06:00
Riley Davis cc14e738a2 Merge pull request #8 from coralproject/mock-stream-endpoint
Mocking stream endpoint
2016-11-04 10:58:38 -06:00
Riley Davis e13e09d254 res.json is not a Promise. 2016-11-04 10:53:11 -06:00
gaba 730bd29bd1 Lint for test. 2016-11-04 09:43:01 -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