Commit Graph

4030 Commits

Author SHA1 Message Date
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
Dan Zajdband 6ddece4717 Fixed closing at 2016-12-16 16:16:48 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Riley Davis 5d96ff9d63 Merge branch 'master' into my-comments-designs 2016-12-16 12:29:38 -07:00
Riley Davis 647d62969d design tweaks per kim 2016-12-16 12:24:32 -07:00
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
Dan Zajdband 9e9291ba64 Lint 2016-12-16 12:07:54 -05:00
Dan Zajdband 8631c3bd9b Adding show shortcuts button and minor fixes 2016-12-16 12:03:37 -05:00
gaba 4a76e43309 Merge branch 'master' into csrf 2016-12-15 14:25:08 -08: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
gaba 70c86bf8f5 Merge branch 'master' into csrf 2016-12-15 13:54:22 -08: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
gaba e76d6e4694 Merge branch 'master' into csrf 2016-12-15 13:23:18 -08:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
gaba fc042779c2 Adds csurf to and cookie-parser to manage CRSF protection. 2016-12-15 12:56:34 -08: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
David Jay 1154b65c91 Updating state from menu. 2016-12-15 14:19:44 -05:00
David Jay 328eaad8e5 Adding update state to reducer. 2016-12-15 14:05:10 -05:00
David Jay c7b232f0b3 Adding action to upate asset state. 2016-12-15 13:10:23 -05:00
Riley Davis d599a65c05 file not being used anywhere 2016-12-15 10:44:20 -07:00
David Jay 86eef68b16 Adding status menu. 2016-12-15 12:25:43 -05:00
David Jay d526898962 Loading assets into Streams component. 2016-12-14 20:19:27 -05:00
David Jay faafbfa78c Loading assets and adding to store. 2016-12-14 19:58:04 -05:00
David Jay 78c81aeaf4 Adding asset reducer. 2016-12-14 19:30:59 -05:00
David Jay b98201afa3 Adding and testing function to fetch assets in talk reducer. 2016-12-14 19:03:07 -05:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
David Jay 65b308a061 Adding initial stream list. 2016-12-14 16:01:43 -05: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
David Jay 7c6299243f Connecting sorting options to state. 2016-12-14 15:29:56 -05:00
Riley Davis eac53a58b4 add jsdom. tests pass 2016-12-14 13:22:01 -07:00
David Jay dad46cc8de Add style and language to left nav. 2016-12-14 15:15:13 -05:00
David Jay fe2487dea5 Add streams option and sidebar. 2016-12-14 15:02:26 -05: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