wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 06:31:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
212 Commits 10 Branches 125 Tags
bc7c877bfbdfd72b4ecb1b91e2d19bb6f84c8b41
Commit Graph

51 Commits

Author SHA1 Message Date
David Jay c8bdecbd1b Merge branch 'master' of https://github.com/coralproject/talk into post-comment 2016-11-07 16:29:06 -05:00
David Jay 0e1e04d2a9 Returning usernames. 2016-11-07 16:19:20 -05:00
David Jay 4737e84681 Displaying comments and replies appropriately. 2016-11-07 16:11:10 -05:00
gaba d911e5b30d Improve test. 2016-11-07 13:08:23 -08:00
gaba 03e5242dcf Merge branch 'master' into comment-api-implementation 2016-11-07 12:22:31 -08: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 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 Erwin c84fc24f78 Update based on review 2016-11-07 13:07:25 -05:00
Dan Zajdband adb2dc2054 fix(coral-admin): updated queue endpoint 2016-11-07 12:21:27 -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
David Erwin c1359a9af9 Move url route into general asset search 2016-11-05 14:44:42 -04:00
David Erwin a6b2215a4b Implement asset tests 2016-11-05 11:14:21 -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
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 43a70ea71c Add tests for stream. Move to promises the rightway. 2016-11-04 14:45:46 -07: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 7f31d4b9e9 Merge branch 'comment-api' of github.com:coralproject/talk into comment-api 2016-11-04 14:16:25 -07:00
gaba 23ea7025ea Convert from promises to array 2016-11-04 14:13:22 -07: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
gaba 19a7de5c98 Remove validations for now until we really use them. 2016-11-04 13:28:40 -07:00
gaba 8cea206dd8 Add chai-http for tests. Simplify route for comments 2016-11-04 13:21:55 -07:00
Riley Davis dba1b04558 204 no content 2016-11-04 14:06:02 -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
Riley Davis 2af57b9ab0 Merge branch 'master' into parse-body-send-json 2016-11-04 11:00:03 -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
gaba 6f52dfa554 Merge branch 'stream-endpoint' into comment-post-api 2016-11-04 09:08:33 -07: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
David Jay 70630918cc Adding stream endpoint. 2016-11-03 17:52:33 -07:00
David Jay df77ee963a Adding find functions and tests to comment model. 2016-11-03 17:06:15 -07:00
Riley Davis 81e16f8a8d don't bind res.json 2016-11-03 16:47:18 -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 596ee595be merge master 2016-11-03 13:50:43 -06:00
Riley Davis afc3e82d60 update routes and paths. add init script 2016-11-03 13:36:31 -06:00
David Jay 5f02d1e948 Simplifying mock routes and adding error handling. 2016-11-03 10:52:29 -07:00
Riley Davis c2d4e1255b terseness 2016-11-03 11:33:32 -06:00
Riley Davis 73be4cfe28 add some update statics 2016-11-03 11:25:09 -06:00
Dan Zajdband e8045be5e2 Linted code 2016-11-03 12:06:36 +01:00
David Jay e805573bd4 Adding build script to package.json 2016-11-02 15:45:52 -07:00
David Jay db6757b99e Adding stream endpoint and mocking 2016-11-02 14:43:42 -07:00