Commit Graph

507 Commits

Author SHA1 Message Date
Dan Zajdband decdfad39b Adding show shortcuts button and minor fixes (#177)
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
2016-12-16 12:32:09 -05:00
riley c7d4bb6961 add a newline so lint doesn't complain 2016-12-15 15:20:50 -07:00
riley 632956e084 failed to update tests. working now 2016-12-15 15:20:02 -07:00
Gabriela Rodríguez Berón 70ef071464 Merge branch 'master' into fix-embed-pathing 2016-12-15 13:50:41 -08:00
Riley Davis 181e558b28 comments not showing on embed page 2016-12-15 14:36:14 -07:00
Riley Davis 203d35e6d1 link to comment instead of article 2016-12-15 14:33:33 -07:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
Gabriela Rodríguez Berón 5ffc575fae Merge branch 'master' into my-comments-fix 2016-12-15 12:52:26 -08:00
Dan Zajdband fcb107aefe Global comment stream close setting (#171)
* Added basic ui

* Added functionality

* Linted code

* using named params instead of props

* lint

* fixed missing merge
2016-12-15 15:50:19 -05:00
Riley Davis 1ea284d428 remove fromJS call 2016-12-15 13:43:06 -07:00
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
Riley Davis d599a65c05 file not being used anywhere 2016-12-15 10:44:20 -07:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
Riley Davis 601010f1f9 update constant names 2016-12-14 13:58:28 -07:00
Riley Davis a6fdd2e46b remove redundant endpoint 2016-12-14 13:53:07 -07:00
Riley Davis eac53a58b4 add jsdom. tests pass 2016-12-14 13:22:01 -07:00
Riley Davis 624eaeee11 move tests to tests directory 2016-12-14 12:01:32 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
Riley Davis 243bd50894 Merged branch master into my-comments 2016-12-13 15:01:34 -07:00
riley 2be60b3208 Merged master into my-comments 2016-12-13 14:33:17 -07:00
David Jay f17564ec36 Merge branch 'master' into view-char-count 2016-12-13 15:34:58 -05:00
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
Riley Davis 37d8c3ad38 try to request a list of assets and fail 2016-12-13 12:40:06 -07:00
Riley Davis 454357fa55 Merge branch 'master' into view-char-count 2016-12-13 12:09:52 -07:00
David Jay 9c7eeb1ec5 Merge branch 'master' into use-js-while-rendering 2016-12-13 14:06:37 -05:00
David Jay 72226f6fe8 Merge branch 'master' into asset-status 2016-12-13 14:00:58 -05:00
gaba 387e20309a We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage. 2016-12-13 10:42:30 -08:00
David Jay 113ceb9889 Merge branch 'master' into view-char-count 2016-12-13 13:28:06 -05:00
gaba 020452684f Merge branch 'master' into asset-status 2016-12-13 10:10:21 -08:00
David Jay 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
David Jay 4dca9ff061 Updating translation. 2016-12-13 12:02:00 -05:00
Gabriela Rodríguez Berón b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
gaba 270e6ba70c Merge branch 'master' into asset-status 2016-12-12 22:20:45 -08:00
gaba 9043ae9f20 We are using asset and not article. 2016-12-12 22:19:09 -08:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00
David Jay 24cc86b130 Merge branch 'master' into use-js-while-rendering 2016-12-12 20:36:10 -05:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -05:00
David Jay ff62c9c14d Merge branch 'master' of github.com:coralproject/talk into set-char-count 2016-12-12 20:30:32 -05:00
David Jay 87a5c4b2d6 Displaying character count and preventing user from posting when count is too high. 2016-12-12 20:29:54 -05:00
David Jay 44e397b86c Passing character count into commentbox. 2016-12-12 19:36:32 -05:00
David Jay 426e0a02bd Raising error if no count is entered. 2016-12-12 19:12:53 -05:00
David Jay bd240923cc Updating default charcount setting. 2016-12-12 19:10:54 -05:00
David Jay cd63f49a5e Disabling save button on error and updating translations. 2016-12-12 19:08:35 -05:00
gaba 0648b2b1c8 More tests. 2016-12-12 15:38:28 -08:00
Riley Davis d43cd9caf9 list comments out 2016-12-12 16:26:02 -07:00
David Jay ba8a845741 Making character input field green to match designs. 2016-12-12 18:14:03 -05:00
David Jay 4a4b92299c Adding error message. 2016-12-12 18:10:47 -05:00
David Jay 48b1f7fc2b Moving text to translations file. 2016-12-12 17:45:20 -05:00
David Jay 182c504edb Updating settings box style. 2016-12-12 17:35:33 -05:00
David Jay f58ede45d9 Merge branch 'master' into wordlist 2016-12-12 17:20:33 -05:00