Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 74f97a8942cd13572293ff79aec600fcdab4ed88 https://github.com/galaxyproject/galaxy/commit/74f97a8942cd13572293ff79aec60... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-select-content.js
Log Message: ----------- Fix for dropping into run workflow iframe
Commit: 7304d5bdc4997da727747f86cf7049bb2452050a https://github.com/galaxyproject/galaxy/commit/7304d5bdc4997da727747f86cf704... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-table.js A client/galaxy/scripts/mvc/user/user-custom-builds.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/style/less/ui.less M lib/galaxy/web/framework/base.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/user.py A static/GruntFile.js A static/GruntFile.js.map M static/maps/layout/menu.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-table.js.map A static/maps/mvc/user/user-custom-builds.js.map M static/maps/mvc/user/user-preferences.js.map 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/scripts/layout/menu.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-table.js A static/scripts/mvc/user/user-custom-builds.js M static/scripts/mvc/user/user-preferences.js M static/style/blue/base.css R templates/user/dbkeys.mako
Log Message: ----------- Merge branch 'dev' into history_drag_drop_000
Commit: ba91462362c59a1a0dbbfdc80920642de10dbd20 https://github.com/galaxyproject/galaxy/commit/ba91462362c59a1a0dbbfdc809206... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-select-content.js
Log Message: ----------- Add delay attribute to time success/error highlighting
Commit: 37b6d907cbc338793f950d33904421faf376f2c3 https://github.com/galaxyproject/galaxy/commit/37b6d907cbc338793f950d3390442... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css
Log Message: ----------- Remove unused cursor style
Commit: 6f95ba9c2c7637fef29d639b19cde81cc3f0ec74 https://github.com/galaxyproject/galaxy/commit/6f95ba9c2c7637fef29d639b19cde... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M lib/galaxy/webapps/galaxy/api/histories.py
Log Message: ----------- Merge branch 'dev' into history_drag_drop_000
Commit: d2205c4167aa543be633721b6650098bca6835b4 https://github.com/galaxyproject/galaxy/commit/d2205c4167aa543be633721b66500... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M lib/galaxy/webapps/galaxy/api/users.py
Log Message: ----------- Merge branch 'dev' into history_drag_drop_000
Commit: 6a625b2c6116992bd475cffe4f11a8ced41110fe https://github.com/galaxyproject/galaxy/commit/6a625b2c6116992bd475cffe4f11a... Author: guerler aysam.guerler@gmail.com Date: 2017-04-05 (Wed, 05 Apr 2017)
Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py
Log Message: ----------- Merge branch 'dev' into history_drag_drop_000
Commit: bcd24e845477d72761072baf014119b3dda2372d https://github.com/galaxyproject/galaxy/commit/bcd24e845477d72761072baf01411... Author: John Chilton jmchilton@gmail.com Date: 2017-04-06 (Thu, 06 Apr 2017)
Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-view-edit.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css
Log Message: ----------- Merge pull request #3886 from guerler/history_drag_drop_000
History drag-and-drop feature with iframe support for run workflow form
Compare: https://github.com/galaxyproject/galaxy/compare/5055172e64bb...bcd24e845477