Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d98aba9c2a335df93d1d6328edef8077529cf84b https://github.com/galaxyproject/galaxy/commit/d98aba9c2a335df93d1d6328edef8... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/default/default-view.js.map M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Fix ambiguous naming of item/model/row variables, add drag and drop helper text and styles Commit: 7c0ad6b85720f0f6101f92061c19dfcd5947ff05 https://github.com/galaxyproject/galaxy/commit/7c0ad6b85720f0f6101f92061c19d... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-view.js.map M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Add similar helper text to composite section Commit: f03840459b1ba61680999dd5ce77cd81d2189c66 https://github.com/galaxyproject/galaxy/commit/f03840459b1ba61680999dd5ce77c... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/upload-view.js.map M static/scripts/mvc/upload/upload-view.js M static/style/blue/base.css Log Message: ----------- Shorten title text, center drop helper labels Commit: 4ff2d913ef372bd494b3c49a3726d5cfb4e80269 https://github.com/galaxyproject/galaxy/commit/4ff2d913ef372bd494b3c49a3726d... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/managers/base.py M lib/galaxy/managers/sharable.py M lib/galaxy/webapps/galaxy/api/histories.py M lib/galaxy/webapps/galaxy/buildapp.py A lib/galaxy/webapps/tool_shed/api/configuration.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/config.py Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_001 Commit: ff0b0baf0199e28fbcfd7d876b208ec1d15af4eb https://github.com/galaxyproject/galaxy/commit/ff0b0baf0199e28fbcfd7d876b208... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/upload.less M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Add icon to helper message Commit: 4d7b3213c940c0d743226c348828ff6ca17b6236 https://github.com/galaxyproject/galaxy/commit/4d7b3213c940c0d743226c348828f... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/composite/composite-view.js Log Message: ----------- Change label text Commit: d89450a53c45cd9aa61e78e2931ba365d7259cdb https://github.com/galaxyproject/galaxy/commit/d89450a53c45cd9aa61e78e2931ba... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/style/less/upload.less M static/scripts/mvc/upload/composite/composite-view.js M static/style/blue/base.css Log Message: ----------- Remove helper text from composite dialog Commit: 8cff4da9248422284f533baaf179d711a94fe739 https://github.com/galaxyproject/galaxy/commit/8cff4da9248422284f533baaf179d... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.js.map M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js M static/style/blue/base.css Log Message: ----------- Improve style class naming, reduce classes Commit: e3c31db51acf9084ebb3aa87435536716d05b041 https://github.com/galaxyproject/galaxy/commit/e3c31db51acf9084ebb3aa8743553... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Improve button icon visibility Commit: 312242b2171bf06bd0551b7684d9a7e89a599f17 https://github.com/galaxyproject/galaxy/commit/312242b2171bf06bd0551b7684d9a... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.js.map M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js M static/style/blue/base.css Log Message: ----------- Floating icon needs special case handling Commit: 46e47dd4cb51ed43210563cfcf8ae37c999be2d0 https://github.com/galaxyproject/galaxy/commit/46e47dd4cb51ed43210563cfcf8ae... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.js.map M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js M static/style/blue/base.css Log Message: ----------- Use shorter style name Commit: 7aa54f43c40598cc5830458985f38c2598b0dcb8 https://github.com/galaxyproject/galaxy/commit/7aa54f43c40598cc5830458985f38... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/style/less/ui.less M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- More css cleanup Commit: b19f4b217b7d12e4820c5bd1c6a2f0c6bae0b772 https://github.com/galaxyproject/galaxy/commit/b19f4b217b7d12e4820c5bd1c6a2f... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M static/maps/mvc/upload/composite/composite-view.js.map M static/scripts/mvc/upload/composite/composite-view.js Log Message: ----------- Remove unused helper code Commit: 3c555b50e6d87f73b3e6d64bd17fae8f2e460402 https://github.com/galaxyproject/galaxy/commit/3c555b50e6d87f73b3e6d64bd17fa... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Update tests Commit: 62db50bfc4fbf00d415e6ea0dca0367d2ec13873 https://github.com/galaxyproject/galaxy/commit/62db50bfc4fbf00d415e6ea0dca03... Author: guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Show dashed border in composite uploader to indicate drop zone Commit: c429777c93680dcee449fe410f5360afbe673758 https://github.com/galaxyproject/galaxy/commit/c429777c93680dcee449fe410f536... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/style/less/ui.less M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/upload/upload-view.js.map M static/scripts/mvc/upload/composite/composite-row.js M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/upload/upload-view.js M static/style/blue/base.css M test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Merge pull request #620 from guerler/upload_001 Improve visibility of drag and drop option, simplify upload UI Compare: https://github.com/galaxyproject/galaxy/compare/0bfc8f0041e0...c429777c9368