Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f27ff0c7ba829a48f9c0eae443baa36cda92cf98 https://github.com/galaxyproject/galaxy/commit/f27ff0c7ba829a48f9c0eae443baa... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-02-24 (Wed, 24 Feb 2016) Changed paths: M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M static/style/blue/base.css Log Message: ----------- Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff loaded due to fa-icon font-family rule by aliasing that to fa Commit: 7a9d4943cd0571f5adebf850b4e167065289700b https://github.com/galaxyproject/galaxy/commit/7a9d4943cd0571f5adebf850b4e16... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M test/tool_shed/base/twilltestcase.py Log Message: ----------- Fix tool shed tests for e4a1d5727805168a9fd15aca1cdd21630ada2bbc . Commit: 15c08d80e4a2c027a01dd8dabc16b802be4c18a1 https://github.com/galaxyproject/galaxy/commit/15c08d80e4a2c027a01dd8dabc16b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M static/style/blue/base.css Log Message: ----------- Merge pull request #1791 from carlfeberhard/release_16.01 [16.01] Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff … Commit: 5546211c0dddb23bbeae34c0cddbd7ad9cebf6b5 https://github.com/galaxyproject/galaxy/commit/5546211c0dddb23bbeae34c0cddbd... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M test/tool_shed/base/twilltestcase.py Log Message: ----------- Merge pull request #1798 from nsoranzo/release_16.01_tool_shed_test_fixes [16.01] Fix tool shed tests for e4a1d5727805168a9fd15aca1cdd21630ada2bbc . Commit: 93069676e6dd03af947ccd60e8d0883b64a5ed39 https://github.com/galaxyproject/galaxy/commit/93069676e6dd03af947ccd60e8d08... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/style/blue/base.css M test/tool_shed/base/twilltestcase.py Log Message: ----------- Merge branch 'release_16.01' into dev Conflicts: static/style/blue/base.css Compare: https://github.com/galaxyproject/galaxy/compare/94f847b3b247...93069676e6dd