Commit Graph

206 Commits

Author SHA1 Message Date
Belen Curcio ef3a34680a config for pre git 2016-11-08 15:52:09 -03:00
Belen Curcio 1508eac92d Removing divs from routes 2016-11-08 15:51:43 -03:00
David Erwin 57ec16e6ef Merge pull request #28 from coralproject/post-comment
Post order bugfix
2016-11-07 18:47:07 -05:00
David Jay 33c77178a9 Fixing id bug in redux store. 2016-11-07 18:41:23 -05:00
David Jay e7f4f82f66 Fixing comment post order bug. 2016-11-07 18:41:07 -05:00
David Erwin b51766ee2e Merge pull request #27 from coralproject/post-comment
Chronological replies and multiline comments
2016-11-07 18:20:45 -05:00
David Jay 269be5b33f Merge branch 'master' into post-comment 2016-11-07 18:17:33 -05:00
David Jay 456524e4ee Adding multiline comments. 2016-11-07 18:09:26 -05:00
David Jay 47bcd163b1 Showing comments in chronological order. 2016-11-07 17:56:44 -05:00
David Erwin 8cc6d9db10 Merge pull request #25 from coralproject/post-comment
Post comment
2016-11-07 17:34:34 -05:00
David Jay f1f051e63f Copying over files in dev webpack 2016-11-07 17:29:49 -05:00
David Jay 4f33818153 Posting items in reverse chronological order. 2016-11-07 17:12:20 -05:00
David Jay c5d15eed77 Fixing bug in reply counting. 2016-11-07 16:54:52 -05:00
David Jay 3bdd1893e0 Commenting out flag button. 2016-11-07 16:48:57 -05:00
David Jay 9c3957ad40 Getting pym via https 2016-11-07 16:47:03 -05:00
David Jay 621a5e806f Merge pull request #24 from coralproject/post-comment
Overriding CI, all we did here was change a docker file and test were running before.
2016-11-07 16:37:26 -05:00
David Jay 167876ee3d Enabling build in dockerfile. 2016-11-07 16:35:46 -05:00
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
David Jay 0e1e04d2a9 Returning usernames. 2016-11-07 16:19:20 -05:00
David Erwin b813f91f9b Merge pull request #23 from coralproject/comment-tests
Comment tests
2016-11-07 16:14:57 -05:00
gaba 8154133fe2 Improve test to remove comment. 2016-11-07 13:11:43 -08: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
David Jay 376d37f05e Removing type dependency when hydrating comments. 2016-11-07 15:44:49 -05:00
David Jay 5a3d6ac287 Adding styling authorname. 2016-11-07 15:40:01 -05:00
David Jay 82f8ed3b4a Adding headers to post function. 2016-11-07 15:39:44 -05:00
David Jay 529a350440 Adding keys to comments. 2016-11-07 15:39:16 -05:00
Riley Davis 95b69167f6 Merge pull request #22 from coralproject/comment-api-implementation
Comment api implementation
2016-11-07 13:37:17 -07:00
Riley Davis f819b087ac Merge branch 'master' into comment-api-implementation 2016-11-07 13:34:58 -07:00
gaba 9e70b86687 Fix tests. 2016-11-07 12:29:07 -08:00
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