Commit ba635a44 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'rel/0.28.1' into 'v0.28'

Rel/0.28.1

See merge request fsl/fsleyes/fsleyes!115
parents 98cf1f1e f11b074b
......@@ -9,6 +9,17 @@ This document contains the ``fsleyes`` release history in reverse
chronological order.
0.28.1 (Monday April 8th 2019)
------------------------------
Fixed
^^^^^
* Fixed a bug in drag-and-drop functionality.
0.28.0 (Friday April 5th 2019)
------------------------------
......
Copyright 2016-2018 University of Oxford, Oxford, UK
Copyright 2016-2019 University of Oxford, Oxford, UK
FSLeyes
Copyright 2016-2018 University of Oxford, Oxford, UK.
Copyright 2016-2019 University of Oxford, Oxford, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
......@@ -4,6 +4,9 @@ FSLeyes
.. image:: https://img.shields.io/pypi/v/fsleyes.svg
:target: https://pypi.python.org/pypi/fsleyes/
.. image:: https://anaconda.org/conda-forge/fsleyes/badges/version.svg
:target: https://anaconda.org/conda-forge/fsleyes
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1470761.svg
:target: https://doi.org/10.5281/zenodo.1470761
......
......@@ -2069,7 +2069,7 @@ class OverlayDropTarget(wx.FileDropTarget):
if filenames is not None:
loadoverlay.loadOverlays(
filenames,
onLoad=self.onLoad,
onLoad=self.__onLoad,
inmem=self.__displayCtx.loadInMemory)
return True
else:
......
......@@ -1513,7 +1513,7 @@ about = {
FSLeyes is released under Version 2.0 of the Apache Software License. Source code for FSLeyes is available at https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes
Copyright 2016-2017 University of Oxford, Oxford, UK.
Copyright 2016-2019 University of Oxford, Oxford, UK.
""").strip(),
# This is a list of all the libraries listed
......
......@@ -14,7 +14,7 @@ version number. See also the :mod:`fsl.version` module.
"""
__version__ = '0.28.0'
__version__ = '0.28.1'
"""Current version number, as a string. The FSLeyes version number consists
of three numbers, separated by a period, which roughly obeys the Semantic
Versioning conventions (http://semver.org/).
......
sphinx==1.6.*
sphinx_rtd_theme==0.*
mock==2.*
coverage==4.*
pytest==3.*
pytest-cov==2.*
sphinx>=1.7
sphinx_rtd_theme
mock
coverage
pytest
pytest-cov
......@@ -87,7 +87,7 @@ class docbuilder(Command):
if op.exists(destdir):
shutil.rmtree(destdir)
import sphinx
import sphinx.cmd.build as sphinx_build
try:
import unittest.mock as mock
......@@ -118,7 +118,7 @@ class docbuilder(Command):
[mock.patch('fsleyes_props.PropertyOwner', MockType)]
[p.start() for p in patches]
sphinx.build_main(['sphinx-build', docdir, destdir])
sphinx_build.main([docdir, destdir])
[p.stop() for p in patches]
......
......@@ -67,8 +67,8 @@ system.
FSLeyes allows you to choose between displaying your overlays in terms of one
:ref:`reference image <display_space_reference_image_space>`, or displaying
all overlays in :ref:`world space <display_space_world_space>`. This setting
is called the *display space*, and you can change independently for each open
view it via the :ref:`view settings panel
is called the *display space*, and you can change it independently for each
open view via the :ref:`view settings panel
<ortho_lightbox_views_view_settings>`.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment