Commit Graph

3586 Commits

Author SHA1 Message Date
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
riley 27116b84ce Merged master into suspect-wordlist 2016-12-15 16:12:19 -07:00
gaba b75408b067 Merge branch 'master' into csrf 2016-12-15 15:11:30 -08:00
Gabriela Rodríguez Berón d6936cdf25 Merge pull request #172 from coralproject/login-fix
The current user can see their own roles.
2016-12-15 15:10:55 -08:00
gaba 670567b8b3 One more expect in the test. 2016-12-15 15:08:01 -08:00
Gabriela Rodríguez Berón 1d652442d0 Merge branch 'master' into login-fix 2016-12-15 15:07:37 -08:00
gaba eb98a41bd5 Merge branch 'master' into csrf 2016-12-15 15:04:36 -08:00
Riley Davis 4b746c1c32 Merge pull request #176 from coralproject/add-tests-for-comment-endpoint
add tests for comment stream for non-admins
2016-12-15 16:02:42 -07:00
gaba 7b8131d4b0 Use session instead of cookies. 2016-12-15 15:01:05 -08:00
Riley Davis 64ac1610eb address different comment in result 2016-12-15 15:58:56 -07:00
riley 833094b6dd check the author_id instead of comment.id 2016-12-15 15:53:47 -07:00
riley 115d19945b add tests for comment stream for non-admins 2016-12-15 15:43:22 -07:00
gaba 4a76e43309 Merge branch 'master' into csrf 2016-12-15 14:25:08 -08:00
Gabriela Rodríguez Berón e157de8697 Merge pull request #175 from coralproject/fixing-my-fixing-fix
Fixing my fixing fix
2016-12-15 14:24:41 -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 459dda5b26 Merge pull request #174 from coralproject/fix-embed-pathing
comments not showing on embed page
2016-12-15 13:53:42 -08:00
Gabriela Rodríguez Berón 70ef071464 Merge branch 'master' into fix-embed-pathing 2016-12-15 13:50:41 -08:00
Gabriela Rodríguez Berón a309c8939d Merge pull request #173 from coralproject/my-comments-fix
allow non-admin folks to list their comments
2016-12-15 13:44:26 -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
gaba 369ed3fc29 Adds csrf protection to some routes. 2016-12-15 13:12:03 -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
Gabriela Rodríguez Berón ecfedabc28 Merge branch 'master' into login-fix 2016-12-15 12:51:31 -08:00
Wyatt Johnson 9cf2d88ce2 Merge branch 'master' into suspect-wordlist 2016-12-15 13:51:16 -07: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
Wyatt Johnson 556f58e4eb Merge branch 'master' into login-fix 2016-12-15 13:32:18 -07:00
Riley Davis 39fdd168fa admins can still view all comment streams 2016-12-15 13:18:28 -07:00
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
Kim Gardner d64c848baa Merge pull request #163 from coralproject/my-comments
My comments
2016-12-15 14:24:21 -05:00
David Jay 1154b65c91 Updating state from menu. 2016-12-15 14:19:44 -05:00
Wyatt Johnson 1713b52cb0 The current user can see their own roles. 2016-12-15 12:14:58 -07: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
Riley Davis 0892996be0 remove this route until someone is actually using it 2016-12-15 10:41:34 -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