Commit Graph

1109 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
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
Gabriela Rodríguez Berón 1d652442d0 Merge branch 'master' into login-fix 2016-12-15 15:07:37 -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
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
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
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
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
Gabriela Rodríguez Berón ecfedabc28 Merge branch 'master' into login-fix 2016-12-15 12:51:31 -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
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
Wyatt Johnson 1713b52cb0 The current user can see their own roles. 2016-12-15 12:14:58 -07: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
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 a072601c3e ignore html files 2016-12-14 13:35:28 -07:00
Riley Davis eac53a58b4 add jsdom. tests pass 2016-12-14 13:22:01 -07:00
Riley Davis 755d090289 Merged branch master into my-comments 2016-12-14 12:01:39 -07:00
Riley Davis 624eaeee11 move tests to tests directory 2016-12-14 12:01:32 -07:00
Riley Davis 7ef75fa92c Merge pull request #170 from coralproject/build-fix
Updated tests, fixes #166
2016-12-13 16:24:49 -07:00
Wyatt Johnson 3710d23991 Fixed the settings cache 2016-12-13 16:16:39 -07:00
Wyatt Johnson 55bd600d96 Removed public function in favor of filterForUser transformer 2016-12-13 16:14:49 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
Wyatt Johnson 9bc81f97e5 Merge branch 'master' into build-fix 2016-12-13 15:16:57 -07:00
Wyatt Johnson ce17fa8773 Updated tests, fixes #166 2016-12-13 15:15:08 -07:00
Riley Davis 243bd50894 Merged branch master into my-comments 2016-12-13 15:01:34 -07:00
Riley Davis 3754bbd466 Merge pull request #167 from coralproject/view-char-count
View char count
2016-12-13 14:50:21 -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
Gabriela Rodríguez Berón 5ed961a90a Merge pull request #169 from coralproject/pluralize-asset
pluralize asset endpoints
2016-12-13 12:03:37 -08:00
Gabriela Rodríguez Berón 497fbaef25 Merge branch 'master' into pluralize-asset 2016-12-13 12:00:33 -08:00
Gabriela Rodríguez Berón ec49f22c0e Merge pull request #168 from coralproject/hide-wordlist-from-fe
Preventing backend from sending banned words to frontend
2016-12-13 11:58:57 -08:00
Riley Davis 61795fa110 tests pass 2016-12-13 12:49:45 -07:00
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
Gabriela Rodríguez Berón 163fa5fbeb Merge branch 'master' into hide-wordlist-from-fe 2016-12-13 11:40:18 -08:00