Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6342 integration review #2

Merged
merged 58 commits into from Feb 28, 2012
Merged

6342 integration review #2

merged 58 commits into from Feb 28, 2012

Conversation

atarkowska
Copy link

HI Chris

If you are happy of those changes, please merge them with your branch

Ola

@atarkowska
removing isOwnerConnected
3cc0881 
webadmin.manage_group_owner uses @login_required(isGroupOwner=True)
@atarkowska
removing isAdminConnected
984d9b9 
webadmin.enums uses @login_required(isAdmin=True)
webadmin.manage_enum uses @login_required(isAdmin=True)
@atarkowska
removing isUserConnected, no longer in use
77ef659
@atarkowska
removing connectors variable, no longer in use
9d219c8
@atarkowska
webclient.index uses @login_required(), cleaned
b141d9c
@atarkowska
webclient.index_context uses @login_required(), cleaned
c1c4e04
@atarkowska
webclient.index_last_imports uses @login_required(), cleaned
5f0948a
@atarkowska
webclient.index_most_recent uses @login_required(), cleaned
b54f3c5
@atarkowska
webclient.index_tag_cloud uses @login_required(), cleaned
abbeadb
@atarkowska
webclient.change_active_group uses @login_required(), cleaned
1c502a6 
refer to #8111
@atarkowska
webclient.load_template @login_required(), cleaned
1a55c87
@atarkowska
webclient.load_data @login_required(), cleaned
c51bce2
@atarkowska
webclient.load_searching @login_required(), cleaned
9373cb4
@atarkowska
webclient.load_data_by_tag @login_required(), cleaned
bd7418b
@atarkowska
webclient.autocomplete_tags @login_required(), cleaned
2d35091
@atarkowska
webclient.open_astex_viewer @login_required(), cleaned
aea379c
@atarkowska
fixing global name 'conn' is not defined
eabaa8d 
thrown in omeroweb/decorators.py in prepare_share_connection, line 66
@atarkowska
webclient.load_public @login_required(), cleaned
30fc0d2
@atarkowska
webclient.manage_action_containers @login_required(), cleaned
201021b
@atarkowska
adding test for #8118
60f040f
@atarkowska
webclient.load_metadata_details @login_required(), awaiting for #8118
d5042c0
@atarkowska
webclient.load_metadata_preview @login_required(), awaiting for #8118
3e90ee4
@atarkowska
webclient.load_metadata_preview removing unused arg
9c2caa8
@atarkowska
webclient.load_metadata_hierarchy @login_required(), awaiting for #8118
7e1bf2e
@atarkowska
webclient.load_metadata_details removing unused arg
3757b1b
@atarkowska
webclient.load_metadata_acquisition @login_required(), awaiting for #…
c93e5d2 
…8118
@atarkowska
webclient.batch_annotate @login_required(), cleaned
ae7a902
@atarkowska
webclient.annotate_file @login_required(), cleaned
5eae756
@atarkowska
webclient.annotate_comment @login_required(), cleaned
8328184
@atarkowska
webclient.annotate_tags @login_required(), cleaned
bc6f5d3
@atarkowska
webclient.activities @login_required(), cleaned
821b155
@atarkowska
webclient.avatar @login_required(), cleaned
4681f14
@atarkowska
webclient.render_birds_eye_view @login_required(), cleaned
40190cd
@atarkowska
webclient.render_thumbnail @login_required(), cleaned
42a1034
@atarkowska
webclient.render_birds_eye_view removing unused arg
a115812
@atarkowska
webclient.render_thumbnail_resize @login_required(), cleaned
1afb9ec
@atarkowska
webclient.render_image @login_required(), cleaned
b48349b
@atarkowska
webclient.render_image_region @login_required(), cleaned
8521bc8
@atarkowska
webclient.plateGrid_json @login_required(), cleaned
a031ba0
@atarkowska
webclient.image_viewer @login_required(), cleaned
eadc9ed
@atarkowska
webclient.imageData_json @login_required(), cleaned
4dc8b53
@atarkowska
webclient.render_row_plot @login_required(), cleaned
fd2006c
@atarkowska
webclient.render_col_plot @login_required(), cleaned
8c9a717
@atarkowska
webclient.render_split_channel @login_required(), cleaned
371ec5f
@atarkowska
webclient.list_scripts @login_required(), cleaned
ae3ebf0
@atarkowska
webclient.script_ui @login_required(), cleaned
0260aa4
@atarkowska
webclient.script_run @login_required(), cleaned
ea3fe10
@atarkowska
removing webgateway view methods from webclient, no longer needed
9a8cd8f
@atarkowska
removing unused argument
c9b6e09 
with session was removed from _get_prepared_image
code cleanup in render_movie and render_birds_eye_view
@chris-allan chris-allan merged commit c9b6e09 into chris-allan:6342_integration Feb 28, 2012
@chris-allan
Copy link
Owner

chris-allan/openmicroscopy:6342_integration is now the same as aleksandra-tarkowska/openmicroscopy:6342_integration_review (via rebase). Closing.

chris-allan pushed a commit that referenced this pull request May 28, 2012
@atarkowska
Merge pull request #2 from cneves/8610_merging
19e63b8 
8610 merging
chris-allan pushed a commit that referenced this pull request Jul 11, 2012
@joshmoore
Merge pull request ome#225 from 'melissalinkert/9308-config-paths'
93f7a55 
Note: This closes omegh-225 but also includes
melissalinkert/gh-2 which Jean-Marie opened.
I've manually merged them altogether here
since I don't have access to Melissa's repo.
chris-allan pushed a commit that referenced this pull request Dec 4, 2012
Merge pull request #2 from jburel/fs-lite-merge
e06cdf3 
Fs lite merge
chris-allan pushed a commit that referenced this pull request Jun 11, 2013
@jburel
Merge pull request #2 from scottlittlewood/import-callback
6d1f7ee 
Layout the import header
chris-allan pushed a commit that referenced this pull request May 12, 2014
@hflynn
Merge pull request #2 from qidane/javadoc-css
905a964 
Combined style for v1.6 and v1.7 of javadocs
chris-allan pushed a commit that referenced this pull request Nov 7, 2014
Merge pull request #2 from aleksandra-tarkowska/11537_shares
50b687a 
replacing old icon for shares
chris-allan pushed a commit that referenced this pull request Apr 7, 2015
@dominikl
Merge pull request #2 from jburel/omero_properties
ec9e652 
Fix possible NPE
chris-allan pushed a commit that referenced this pull request Nov 1, 2018
@rgozim
Merge pull request #2 from dominikl/update_thumbnail_loading_dom
5b9a770 
Add empty implementation to Destroyable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@atarkowska @chris-allan