Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6b782ad16d010d6da7808ac7deaecef3ec301b73 https://github.com/galaxyproject/galaxy/commit/6b782ad16d010d6da7808ac7deaec... Author: Nuwan Goonasekera <nuwan.ag@gmail.com> Date: 2018-03-01 (Thu, 01 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/style/less/ui.less M tools/genomespace/genomespace_exporter.xml M tools/genomespace/genomespace_importer.xml M tools/genomespace/genomespace_push.xml Log Message: ----------- Changed GenomeSpace token handling to use manual OpenID association only Commit: 10cf046ea8604a367b734b7d1b58e623705ed11c https://github.com/galaxyproject/galaxy/commit/10cf046ea8604a367b734b7d1b58e... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-02 (Fri, 02 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js Log Message: ----------- replace syntax that is too new Commit: 69bbcda0b3577edcb7042cdf26f4373ea1ed5f67 https://github.com/galaxyproject/galaxy/commit/69bbcda0b3577edcb7042cdf26f43... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-02 (Fri, 02 Mar 2018) Changed paths: M static/maps/mvc/ui/ui-select-genomespace.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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-genomespace.js M static/style/blue/base.css Log Message: ----------- build client Commit: f8d44c2b69516f9464aad4acfc2bbf68ce3ede08 https://github.com/galaxyproject/galaxy/commit/f8d44c2b69516f9464aad4acfc2bb... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-03-06 (Tue, 06 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/style/less/ui.less M static/maps/mvc/ui/ui-select-genomespace.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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-genomespace.js M static/style/blue/base.css M tools/genomespace/genomespace_exporter.xml M tools/genomespace/genomespace_importer.xml M tools/genomespace/genomespace_push.xml Log Message: ----------- Merge pull request #5631 from martenson/genomespace [17.09] Changed GenomeSpace token handling to use manual OpenID association only Commit: 10f8c3bc82b3a87dfa4125aa6eca9eb9071d3609 https://github.com/galaxyproject/galaxy/commit/10f8c3bc82b3a87dfa4125aa6eca9... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-07 (Wed, 07 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/style/less/ui.less M static/style/blue/base.css M tools/genomespace/genomespace_exporter.xml M tools/genomespace/genomespace_importer.xml M tools/genomespace/genomespace_push.xml Log Message: ----------- Merge branch 'release_17.09' into release_18.01 dropped all static content from merge except of styles Commit: e5d0c1c0eeffe9406f58f08b112fad332655e229 https://github.com/galaxyproject/galaxy/commit/e5d0c1c0eeffe9406f58f08b112fa... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-07 (Wed, 07 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/style/less/ui.less M static/style/blue/base.css M tools/genomespace/genomespace_exporter.xml M tools/genomespace/genomespace_importer.xml M tools/genomespace/genomespace_push.xml Log Message: ----------- Merge branch 'merge-in-18.01' into dev Commit: cf369e84e3a8f1989bfb82284a6703994fdbe971 https://github.com/galaxyproject/galaxy/commit/cf369e84e3a8f1989bfb82284a670... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-07 (Wed, 07 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js Log Message: ----------- re-add erroneously removed line Commit: 300fffe73ee07d42a59c22b869eb3666b47dc720 https://github.com/galaxyproject/galaxy/commit/300fffe73ee07d42a59c22b869eb3... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-07 (Wed, 07 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/style/less/ui.less M static/style/blue/base.css M tools/genomespace/genomespace_exporter.xml M tools/genomespace/genomespace_importer.xml M tools/genomespace/genomespace_push.xml Log Message: ----------- Merge pull request #5660 from martenson/merge-genomespace Merge forward genomespace changes Compare: https://github.com/galaxyproject/galaxy/compare/fffca430d216...300fffe73ee0