Rebase/develop/csrf#47
Merged
will-moore merged 56 commits intowill-moore:5_0_6_rebasefrom Nov 17, 2014
atarkowska:rebase/develop/csrf
Merged
Rebase/develop/csrf#47will-moore merged 56 commits intowill-moore:5_0_6_rebasefrom atarkowska:rebase/develop/csrf
will-moore merged 56 commits intowill-moore:5_0_6_rebasefrom
atarkowska:rebase/develop/csrf
Conversation
Conflicts: components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/experimenters.html components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/groups.html
Conflicts: components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/experimenters.html components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/groups.html
Conflicts: components/tools/OmeroWeb/omeroweb/webgateway/templates/webgateway/base/includes/script_src_jquery.html
Conflicts: components/tools/OmeroWeb/omeroweb/webadmin/tests/request_factory.py components/tools/OmeroWeb/omeroweb/webadmin/tests/test_webadmin.py
Conflicts: components/tools/OmeroWeb/omeroweb/settings.py
Conflicts: components/tools/OmeroWeb/omeroweb/webclient/views.py
Conflicts: components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/container_subtree.html components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/data/containers_icon.html
Conflicts: components/tools/OmeroWeb/omeroweb/webgateway/templates/webgateway/viewport/omero_image.html
Conflicts: components/tools/OmeroWeb/test/integration/test_settings.py
Conflicts: components/tools/OmeroWeb/omeroweb/webgateway/templates/webgateway/viewport/omero_image.html
Conflicts: components/tools/OmeroWeb/test/integration/test_settings.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR already in:
PR already in:
updating full viewer template to support csrf f29d1ab
N/A reseting rendering settings to call post only c76d66f
N/A copy and past rendering settings to call get on copy and post on past 53de9a4
N/A apply owners settings to call post only 8127dd4
PR already in:
replaced by cbc9c37
escaping image and channel name in webgateway ba55e88
PR already in:
making QA feedback URL configurable da88120
PR already in:
Handle broken image links in public shares correctly as before ome#3124 ca589f7
PR already in:
adding deleted objects to the subtree 39f7015
N/A escaping image names and description in image viewer 5704cd0
test/integration/test_csrf.py::TestCsrf::test_csrf_middleware_enabled PASSED
test/integration/test_csrf.py::TestCsrf::test_forgot_password PASSED
test/integration/test_csrf.py::TestCsrf::test_add_and_rename_container PASSED
test/integration/test_csrf.py::TestCsrf::test_move_data PASSED
test/integration/test_csrf.py::TestCsrf::test_add_and_remove_comment PASSED
test/integration/test_csrf.py::TestCsrf::test_add_edit_and_remove_tag PASSED
test/integration/test_csrf.py::TestCsrf::test_attach_file PASSED
test/integration/test_csrf.py::TestCsrf::test_paste_move_remove_deletamany_image PASSED
test/integration/test_csrf.py::TestCsrf::test_basket_actions PASSED
test/integration/test_csrf.py::TestCsrf::test_edit_channel_names PASSED
test/integration/test_csrf.py::TestCsrf::test_copy_past_rendering_settings xfail
test/integration/test_csrf.py::TestCsrf::test_reset_rendering_settings xfail
test/integration/test_csrf.py::TestCsrf::test_apply_owners_rendering_settings xfail
test/integration/test_csrf.py::TestCsrf::test_ome_tiff_script PASSED
test/integration/test_csrf.py::TestCsrf::test_script PASSED
test/integration/test_csrf.py::TestCsrf::test_myaccount PASSED
test/integration/test_csrf.py::TestCsrf::test_avatar PASSED
test/integration/test_csrf.py::TestCsrf::test_create_group PASSED
test/integration/test_csrf.py::TestCsrf::test_create_user PASSED
test/integration/test_csrf.py::TestCsrf::test_edit_group PASSED
test/integration/test_csrf.py::TestCsrf::test_edit_user PASSED
test/integration/test_csrf.py::TestCsrf::test_edit_group_by_owner PASSED
test/integration/test_csrf.py::TestCsrf::test_change_password PASSED
test/integration/test_csrf.py::TestCsrf::test_su PASSED
test/integration/test_rendering.py::TestCsrf::test_copy_past_rendering_settings_from_image PASSED
test/integration/test_rendering.py::TestCsrf::test_copy_past_rendering_settings_from_url PASSED