Commit Graph

8775 Commits

Author SHA1 Message Date
gaba 03e5242dcf Merge branch 'master' into comment-api-implementation 2016-11-07 12:22:31 -08:00
David Jay a5a2372c5e Merge branch 'comment-api-implementation' of https://github.com/coralproject/talk into post-comment 2016-11-07 15:15:15 -05:00
Riley Davis 65a696d82b Merge pull request #21 from coralproject/settings-api-tests
add tests to settings models/endpoints
2016-11-07 13:12:12 -07:00
Riley Davis 601d36f2df whoops missed some semicolons 2016-11-07 12:54:04 -07:00
gaba fc80ea2c3a Check it has body 2016-11-07 11:49:02 -08:00
David Erwin 946f621fc4 Merge branch 'master' into settings-api-tests 2016-11-07 14:46:42 -05:00
Wyatt Johnson 22bb837bc4 Merge pull request #19 from coralproject/asset 2016-11-07 12:46:05 -07:00
David Erwin 9664454831 Merge branch 'master' into settings-api-tests 2016-11-07 14:44:34 -05:00
Wyatt Johnson fff55e808b Merge branch 'master' into asset 2016-11-07 12:42:30 -07:00
gaba 16e7a6c868 CHanges from query to body for post/put. 2016-11-07 11:34:34 -08:00
gaba 38692ccd30 Ignore dist for lint 2016-11-07 11:28:41 -08:00
gaba 6f0698b950 More endpoints 2016-11-07 11:27:05 -08:00
Wyatt Johnson 4a9c1775f1 Updated linting rules + fixed test layout to standardize 2016-11-07 11:51:45 -07:00
David Jay e5c04b5fd1 Updating routes and adding dev webpack to package.json 2016-11-07 13:51:40 -05:00
David Jay 3b75445309 Displaying comment author names. 2016-11-07 13:51:10 -05:00
David Jay cb68298171 Adding temporary user name field to commentbox. 2016-11-07 13:39:33 -05:00
Riley Davis 108c50cb95 add tests to settings models/endpoints 2016-11-07 11:28:09 -07:00
David Jay f04e2505ec Adding title to iframe for screen readers. 2016-11-07 13:25:45 -05:00
David Erwin d3213dd33e More review updates 2016-11-07 13:18:46 -05:00
David Erwin 7b2b2eaa77 Add more review suggestions. 2016-11-07 13:11:39 -05:00
David Erwin c84fc24f78 Update based on review 2016-11-07 13:07:25 -05:00
David Erwin b1d907238a Merge pull request #20 from coralproject/fixes-coral-admin
fix(coral-admin): Adapt to the new schema.
2016-11-07 12:34:30 -05:00
Dan Zajdband 91d04e5254 fix(coral-admin): dist files 2016-11-07 12:26:26 -05:00
Dan Zajdband adb2dc2054 fix(coral-admin): updated queue endpoint 2016-11-07 12:21:27 -05:00
Dan Zajdband dfdd8ea6f8 fix(coral-admin): updated config 2016-11-07 12:19:33 -05:00
gaba cffee1ec18 Merge branch 'master' of github.com:coralproject/talk into comment-api-implementation 2016-11-07 09:18:51 -08:00
David Erwin 2ff6bcf85d Merging master into asset 2016-11-07 12:00:28 -05:00
Dan Zajdband 53af608419 fix(coral-admin): Adapt to the new schema. Most things are not working yet but at least it bundles 2016-11-07 11:57:34 -05:00
David Erwin c1359a9af9 Move url route into general asset search 2016-11-05 14:44:42 -04:00
David Erwin 2c217c240a Rectify linting and testing disagreements 2016-11-05 11:26:01 -04:00
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