Branch: refs/heads/release_16.01
Home: https://github.com/galaxyproject/galaxy
Commit: 133f77413e9fb933ec1964d279408c1fb8846db4
https://github.com/galaxyproject/galaxy/commit/133f77413e9fb933ec1964d27940…
Author: carlfeberhard <carlfeberhard(a)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/fef166545c36df5c7ba73924c7b0…
Author: carlfeberhard <carlfeberhard(a)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/dd476fc42c57b5e17d8e1e342d7a…
Author: Martin Cech <cech.marten(a)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
Compare: https://github.com/galaxyproject/galaxy/compare/fa1414759e60...dd476fc42c57
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: eee044aa707f9fa6d4c800b4d655fd01b2e08e84
https://github.com/galaxyproject/galaxy/commit/eee044aa707f9fa6d4c800b4d655…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-03-16 (Wed, 16 Mar 2016)
Changed paths:
M Makefile
M doc/source/releases/index.rst
M scripts/bootstrap_history.py
Log Message:
-----------
Work toward automating deployment.
Create new makefile targets for release management.
- ``release-create-issue``: Automates creating a release checklist - https://github.com/jmchilton/galaxy/issues/41)
Check list contains actual tailored ``make`` commands and links (for PRs and issues).
- ``release-check-metadata``: Checks milestone PRs for required metadata needed for generating bootstrapped release notes.
` ``release-bootstrap-history``: Bootstrap release notes from PRs and metadata.
- ``release-check-blocking-prs``: Check for PRs blocking release, should happen before branching release and before tagging release.
- ``release-check-blocking-issues``: Check for Issues blocking release, should happen before tagging release. (Only allowed issue is the release creation issue.)
The issue created with ``release-create-issue`` documents how and when to execute subsequent ``make`` targets (including the target to create the issue for the next release).
This PR contains a bunch of other enhancements to the bootstrap_history.py script to enable these targets and renames ``create_release_rc`` Makefile target so all release related targets start with the prefix ``release-``.
Conflicts:
Makefile
Commit: 67b7294a7278f262f0e2238b0094cef5fc835771
https://github.com/galaxyproject/galaxy/commit/67b7294a7278f262f0e2238b0094…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M Makefile
M doc/source/releases/index.rst
M scripts/bootstrap_history.py
Log Message:
-----------
Merge pull request #1613 from jmchilton/release_process
Work toward automating release management.
Compare: https://github.com/galaxyproject/galaxy/compare/4bf8adbb6462...67b7294a7278
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 58346169dfbe89f845a3f2317bde514c3e65f79f
https://github.com/galaxyproject/galaxy/commit/58346169dfbe89f845a3f2317bde…
Author: guerler <aysam.guerler(a)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/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/page.js
Log Message:
-----------
Fix dom duplication
Commit: fa1414759e604073bc45fe3f2b15dc9f21c72c4c
https://github.com/galaxyproject/galaxy/commit/fa1414759e604073bc45fe3f2b15…
Author: Dannon Baker <dannon.baker(a)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/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/page.js
Log Message:
-----------
Merge pull request #1976 from guerler/fix_ui_000
[16.01] Fix dom duplication
Commit: 4bf8adbb6462456a201a6f69862e0d3fdb1da222
https://github.com/galaxyproject/galaxy/commit/4bf8adbb6462456a201a6f69862e…
Author: Dannon Baker <dannon.baker(a)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/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/page.js
Log Message:
-----------
Merge, rebuild.
Compare: https://github.com/galaxyproject/galaxy/compare/45c17318889d...4bf8adbb6462
Branch: refs/heads/release_16.01
Home: https://github.com/galaxyproject/galaxy
Commit: 58346169dfbe89f845a3f2317bde514c3e65f79f
https://github.com/galaxyproject/galaxy/commit/58346169dfbe89f845a3f2317bde…
Author: guerler <aysam.guerler(a)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/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/page.js
Log Message:
-----------
Fix dom duplication
Commit: fa1414759e604073bc45fe3f2b15dc9f21c72c4c
https://github.com/galaxyproject/galaxy/commit/fa1414759e604073bc45fe3f2b15…
Author: Dannon Baker <dannon.baker(a)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/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/page.js
Log Message:
-----------
Merge pull request #1976 from guerler/fix_ui_000
[16.01] Fix dom duplication
Compare: https://github.com/galaxyproject/galaxy/compare/30750c32e481...fa1414759e60