Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bc79e9cc4a0f5597d6243f946e034f88106141d1 https://github.com/galaxyproject/galaxy/commit/bc79e9cc4a0f5597d6243f946e034... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M templates/webapps/galaxy/history/grid.mako

Log Message: ----------- UI, history: replace copy dialog on grid refresh

Fixes #2624

init_grid is called from update_grid to rebuild the grid. This patches that call to replace the copy links with the dialog.

Note: - related to #1303 which was an effort to make a single code path for copying histories. - Uses monkey patching to keep from porting build artifacts.

Commit: 5f24afb1b3eebb7e30cee3958015b972b0bf2b1d https://github.com/galaxyproject/galaxy/commit/5f24afb1b3eebb7e30cee3958015b... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Fix off by one error, causing only first line of file to be rendered in peek.

Commit: 09b9339569d688e89b6f6fb9abc32b8e2b465e28 https://github.com/galaxyproject/galaxy/commit/09b9339569d688e89b6f6fb9abc32... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M lib/galaxy/datatypes/data.py A test/unit/datatypes/test_data.py

Log Message: ----------- Fixed to only line_count not line_count + 1 lines and added in really basic test

Commit: 7e389c7d54da91298c4b5970314c7e5040902952 https://github.com/galaxyproject/galaxy/commit/7e389c7d54da91298c4b5970314c7... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Fixed E226

Commit: 85671bd466e8bfca0dc22c8fbdc6385a3e9dcf1e https://github.com/galaxyproject/galaxy/commit/85671bd466e8bfca0dc22c8fbdc63... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M test/unit/datatypes/test_data.py

Log Message: ----------- Fixed E302

Commit: f4631d2e59af6596afbf571e5cb983e5ce734115 https://github.com/galaxyproject/galaxy/commit/f4631d2e59af6596afbf571e5cb98... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M templates/webapps/galaxy/history/grid.mako

Log Message: ----------- Merge pull request #2629 from carlfeberhard/fix.saved-copy

[16.01] UI, history: replace copy dialog on grid refresh

Commit: ac64c0162ef5f9c68529ee730326c985f4430280 https://github.com/galaxyproject/galaxy/commit/ac64c0162ef5f9c68529ee730326c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M templates/webapps/galaxy/history/grid.mako

Log Message: ----------- Merge branch 'release_16.01' into release_16.04

Commit: 95c64c0ba917bfbc5d04ff603ec3ca2a58f6c54f https://github.com/galaxyproject/galaxy/commit/95c64c0ba917bfbc5d04ff603ec3c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- Rebuild as a part of merging from 16.01.

Commit: f36095a9fb647eaa6333c3696e37cdaeb945e5bb https://github.com/galaxyproject/galaxy/commit/f36095a9fb647eaa6333c3696e37c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M templates/webapps/galaxy/history/grid.mako

Log Message: ----------- Merge branch 'release_16.04' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/1e36eba631b2...f36095a9fb64