Commit Graph

8775 Commits

Author SHA1 Message Date
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
Riley Davis 1876d38089 disconnect mongoose 2016-11-04 10:09:44 -06:00
gaba 6f52dfa554 Merge branch 'stream-endpoint' into comment-post-api 2016-11-04 09:08:33 -07: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
gaba af09a87c13 Through error instead of process.exit(1) http://eslint.org/docs/rules/no-process-exit 2016-11-04 08:44:53 -07:00
Belen Curcio 024e902fbe úse process exit 2016-11-04 12:25:24 -03:00
Belen Curcio 877200cf19 settings schema swagger 2016-11-04 10:51:08 -03:00
David Jay 6c25ca81d4 Adding stream endpoint tests 2016-11-04 00:02:34 -07:00
David Jay 70630918cc Adding stream endpoint. 2016-11-03 17:52:33 -07:00
David Jay 8e9ebfb1a9 Adding find functions and tests to user and action models. 2016-11-03 17:45:37 -07:00
David Jay 084ee98ce2 Adding .eslintrc to tests. 2016-11-03 17:13:47 -07:00
David Jay df77ee963a Adding find functions and tests to comment model. 2016-11-03 17:06:15 -07:00
Riley Davis d28f46f9ca disallow url-encoded payloads. 2016-11-03 16:49:03 -06:00
Riley Davis 81e16f8a8d don't bind res.json 2016-11-03 16:47:18 -06:00
Riley Davis de405492b9 remove log 2016-11-03 16:36:33 -06:00
Riley Davis 7facdf0840 make the settings routes actually work 2016-11-03 16:34:01 -06:00
David Jay eefa8e3285 Merge branch 'master' into mock-stream-endpoint
# Conflicts:
#	routes/api/index.js
2016-11-03 14:31:51 -07:00
Riley Davis e9f5ec7a3d Merge pull request #7 from coralproject/settings
start settings schema
2016-11-03 15:27:49 -06:00
Riley Davis fecff105ec even more default 2016-11-03 15:26:28 -06:00
Riley Davis 5aa077b92e default connection string 2016-11-03 15:22:44 -06:00