Permalink
Switch branches/tags
Commits on Dec 19, 2013
  1. Add RawFileStore.getFileId for in-place import

    In order to be able to find the right location to symlink
    the file, it's necessary to find the originalfile object
    for upload *before* verifyUpload() has been called.
    joshmoore committed Dec 19, 2013
Commits on Dec 18, 2013
  1. Merge pull request #1888 from snoopycrimecop/merge/develop/submodules

    Update develop submodules
    joshmoore committed Dec 18, 2013
  2. Update develop submodules

    Repository: openmicroscopy/openmicroscopy
    Already up-to-date.
    
    Repository: openmicroscopy/bioformats
    Updating e3f13fa..adfe6d7
    Merged PRs (fast-forward):
      # PR 828 melissalinkert 'Update POM version numbers to 5.0.0-rc1'
      # PR 833 hflynn 'Removing 'in transition' banner from docs'
      # PR 829 hflynn 'Adding beta2 to version history'
      # PR 830 sbesson 'Add section about JVM memory settings under MATLAB'
      # PR 825 melissalinkert 'bfopen: store both the global and series metadata in the returned array'
      # PR 827 melissalinkert 'Update format pages for 5.0.0-beta2'
      # PR 818 melissalinkert 'Last round of fixes for Maven build system'
      # PR 819 melissalinkert 'Flex: map server-mapped files to the same directory as metadata files'
      # PR 820 joshmoore '7856 flim ann'
      # PR 824 melissalinkert 'Imspector: always set the modulo TypeDescription to "TCSPC"'
      # PR 823 melissalinkert 'Zeiss CZI: adjust for incorrectly recorded extra dimensions'
      # PR 822 melissalinkert 'ND2: prevent alpha component from being set to 0'
      # PR 810 melissalinkert 'Preserve lookup tables when exporting from ImageJ'
      # PR 807 melissalinkert 'CellWorx: ignore thumbnails and missing channel names (rebased onto develop)'
      # PR 804 melissalinkert 'Leica LIF: 'C' goes before other dimensions if SizeC and SizeT > 1'
      # PR 796 melissalinkert 'Zip: improve reader and handle performance'
    
    Repository: ome/scripts
    Already up-to-date.
    
    Repository: openmicroscopy/ome-documentation
    Updating 412e806..c5de70d
    Merged PRs (fast-forward):
      # PR 593 hflynn 'Removing the 'in transition' banner from docs'
      # PR 584 manics 'Web config docs 11723 11724'
      # PR 590 hflynn '11802 fix - updating what's new for OMERO 5 docs'
      # PR 589 sbesson 'Add section about tag plugin in users CLI documentation'
      # PR 581 will-moore 'Doc running App from anywhere & CreateApp refactor'
      # PR 591 hflynn 'Removing reference to beta2'
      # PR 585 hflynn 'Removing swordfish as root password for VA (rebased onto develop)'
      # PR 573 sbesson 'Continous integration fixes'
      # PR 578 will-moore 'Django 1.6 for devs 11757'
      # PR 583 sbesson 'Improve description of CLI usage as a client'
      # PR 580 pwalczysko 'Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment'
      # PR 582 will-moore 'update plugin options. See #11806'
      # PR 576 sbesson 'Review server upgrade and password provider pages'
    
    Generated by OMERO-submods-develop#268 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/268/)
    snoopycrimecop committed Dec 18, 2013
Commits on Dec 17, 2013
  1. Merge pull request #1908 from ximenesuk/fix-skipped-test

    Enable test_cmdcallback.py
    sbesson committed Dec 17, 2013
  2. Merge pull request #1909 from jburel/split-view

    Do not allow to run the split figures on big images.
    joshmoore committed Dec 17, 2013
  3. Merge pull request #1902 from jburel/viewer-issue

    Set global min/max according to pixel type. (see #11840)
    joshmoore committed Dec 17, 2013
  4. Merge pull request #1903 from sbesson/11817_tagcreateset

    CLI tag plugin: bug fixes
    joshmoore committed Dec 17, 2013
  5. Merge pull request #1906 from sbesson/matlab_polyline_fix

    Fix OMERO.matlab polyline/polygon creation
    joshmoore committed Dec 17, 2013
  6. Merge pull request #1901 from will-moore/getProject_Errors_11807

    img.getProject() no Errors if multiple parents. See #11807
    joshmoore committed Dec 17, 2013
  7. Merge pull request #1899 from joshmoore/11810-archived-sql

    Reset Image.archived flag where necessary (Fix #11810)
    joshmoore committed Dec 17, 2013
  8. Merge pull request #1895 from ximenesuk/11824-reduce-debug-logging

    Exclude some DEBUG logging from Blitz.log
    joshmoore committed Dec 17, 2013
  9. Merge pull request #1894 from joshmoore/11813-Roles

    Add DBUserCheck to create a Roles object from the DB (See #11813)
    joshmoore committed Dec 17, 2013
Commits on Dec 16, 2013
  1. Fix createPolyline x, y ordering

    sbesson committed Dec 16, 2013
  2. Fix polyline unit test

    sbesson committed Dec 16, 2013
  3. Merge pull request #1898 from jburel/admin-fix

    Admin fix
    jburel committed Dec 16, 2013
  4. Merge pull request #1890 from jburel/unit-issue

    Fix units if value is 0.0
    jburel committed Dec 16, 2013
  5. Merge pull request #1900 from will-moore/ajax_contentType_11821

    Ajax content type 11821
    joshmoore committed Dec 16, 2013
  6. Merge pull request #1897 from jburel/layout-issue

    Layout issue
    joshmoore committed Dec 16, 2013
  7. Merge pull request #1896 from jburel/tag-selection

    Tag selection
    joshmoore committed Dec 16, 2013
  8. Merge pull request #1893 from jburel/viewed-by-crash

    Check that the correct component is visible.
    joshmoore committed Dec 16, 2013
  9. Merge pull request #1892 from jburel/download-screen

    Plate download
    joshmoore committed Dec 16, 2013
  10. Merge pull request #1891 from jburel/search-crash

    Group was excluded.
    joshmoore committed Dec 16, 2013
  11. Merge pull request #1889 from jburel/download-crash

    Download crash
    joshmoore committed Dec 16, 2013
  12. Merge pull request #1887 from bpindelski/11797-exceptionwindow

    Fix import exception window layout (see #11797).
    joshmoore committed Dec 16, 2013
  13. Merge pull request #1886 from joshmoore/simplejson_upgrade

    Use python's json rather than Django's
    joshmoore committed Dec 16, 2013
Commits on Dec 15, 2013
  1. Clean up comment lines

    sbesson committed Dec 15, 2013