Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 133f77413e9fb933ec1964d279408c1fb8846db4 https://github.com/galaxyproject/galaxy/commit/133f77413e9fb933ec1964d279408... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map 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/scripts/layout/page.js
Log Message: ----------- Fix 'Resend verification' link in inactive user message box which would display as [Object object]
Commit: fef166545c36df5c7ba73924c7b0ea4e1d44ec82 https://github.com/galaxyproject/galaxy/commit/fef166545c36df5c7ba73924c7b0e... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M client/galaxy/scripts/layout/page.js A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py R lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js
Log Message: ----------- Layout: Fix optional panel rendering and associated inline css
Commit: dd476fc42c57b5e17d8e1e342d7a597b986b6b3e https://github.com/galaxyproject/galaxy/commit/dd476fc42c57b5e17d8e1e342d7a5... Author: Martin Cech cech.marten@gmail.com Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map 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/scripts/layout/page.js
Log Message: ----------- Merge pull request #1978 from carlfeberhard/release_16.01
[16.01] Fixes to page.js
Commit: 9eb1db82ca4bbae598d0070de8da78172ca90fa9 https://github.com/galaxyproject/galaxy/commit/9eb1db82ca4bbae598d0070de8da7... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M lib/galaxy/webapps/galaxy/api/lda_datasets.py
Log Message: ----------- Do not convert spaces to tabs when importing datasets into a library.
Reported (with fix provided) by Fabien Mareuil in http://dev.list.galaxyproject.org/automatic-adding-of-a-tab-in-a-fastq-heade...
Commit: cf16b1d692d0e96f3d0aa4d2cf0f9f52c8dd7bb3 https://github.com/galaxyproject/galaxy/commit/cf16b1d692d0e96f3d0aa4d2cf0f9... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M lib/galaxy/webapps/galaxy/api/lda_datasets.py
Log Message: ----------- Merge pull request #1985 from nsoranzo/release_16.01_lda_fixes
[16.01] Do not convert spaces to tabs when importing datasets into a library.
Commit: d10ee6f6c42744fdd4db2981093c1411bd1be6db https://github.com/galaxyproject/galaxy/commit/d10ee6f6c42744fdd4db2981093c1... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M lib/galaxy/webapps/galaxy/api/lda_datasets.py M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js
Log Message: ----------- Merge branch 'release_16.01' into dev
Conflicts: static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map
Compare: https://github.com/galaxyproject/galaxy/compare/2bbae2bb1d11...d10ee6f6c427