Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e5010ad8ef82b5dd5b91d2303a582cb30ff51b0a https://github.com/galaxyproject/galaxy/commit/e5010ad8ef82b5dd5b91d2303a582... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js

Log Message: ----------- Prepare backbone route for datasets endpoint

Commit: 04775ab4d8fc64aaa036e0f26377029c3a65d574 https://github.com/galaxyproject/galaxy/commit/04775ab4d8fc64aaa036e0f263770... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/layout/menu.js

Log Message: ----------- Redirect menu link to new dataset grid endpoint

Commit: 5421dbd606eafd0106c2974a154c78eb93e17b72 https://github.com/galaxyproject/galaxy/commit/5421dbd606eafd0106c2974a154c7... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Transform controller endpoint to dictionary mode

Commit: a26ee06cf997f2438042555b23a85e66cfadeb7e https://github.com/galaxyproject/galaxy/commit/a26ee06cf997f2438042555b23a85... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py

Log Message: ----------- Add client endpoint to backend

Commit: eea8841f533a41f781db7472b190bdc87487bd41 https://github.com/galaxyproject/galaxy/commit/eea8841f533a41f781db7472b190b... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.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 M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js

Log Message: ----------- Fix grid element target

Commit: 2bbe5e04988f5bd642514dcc82576257f945a1a2 https://github.com/galaxyproject/galaxy/commit/2bbe5e04988f5bd642514dcc82576... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js 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 M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map

Log Message: ----------- Fix router url, pack scripts

Commit: 14345a423266abe7b6fa4f31ffd2af5893eb39c2 https://github.com/galaxyproject/galaxy/commit/14345a423266abe7b6fa4f31ffd2a... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: R templates/webapps/galaxy/dataset/grid.mako

Log Message: ----------- Remove mako file

Commit: b0fb99c080ad03453d66def1d3083f2aaf436e84 https://github.com/galaxyproject/galaxy/commit/b0fb99c080ad03453d66def1d3083... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Add refresh handling

Commit: 8aa23f047972b10942a88f629b2c93c656e045be https://github.com/galaxyproject/galaxy/commit/8aa23f047972b10942a88f629b2c9... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Add note on missing highlighting handling

Commit: a5d99ce516bb35bc17dc1c9606c979567f79489c https://github.com/galaxyproject/galaxy/commit/a5d99ce516bb35bc17dc1c9606c97... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py

Log Message: ----------- Remove custom grid mako name from grid definition

Commit: b25bf5946e50dfa9acd17cb32ed057d538da1148 https://github.com/galaxyproject/galaxy/commit/b25bf5946e50dfa9acd17cb32ed05... Author: guerler aysam.guerler@gmail.com Date: 2017-06-08 (Thu, 08 Jun 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/grid/grid-view.js A client/galaxy/scripts/mvc/page/page-list.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M lib/galaxy/datatypes/data.py A lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/text.py M lib/galaxy/webapps/galaxy/controllers/page.py M static/maps/layout/menu.js.map M static/maps/mvc/grid/grid-view.js.map A static/maps/mvc/page/page-list.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 M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/mvc/grid/grid-view.js A static/scripts/mvc/page/page-list.js M templates/sharing_base.mako M templates/webapps/galaxy/page/editor.mako R templates/webapps/galaxy/page/index.mako

Log Message: ----------- Merge branch 'dev' into grid_datasets

Commit: 707c66a6ab4cb4b552affaaf1f03aaf9c6b99a47 https://github.com/galaxyproject/galaxy/commit/707c66a6ab4cb4b552affaaf1f03a... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-06-12 (Mon, 12 Jun 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/layout/menu.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 R templates/webapps/galaxy/dataset/grid.mako

Log Message: ----------- Merge branch 'grid_datasets' into dev

Commit: d36c4053cd16a31ecd77bdc726cfb52179088e4f https://github.com/galaxyproject/galaxy/commit/d36c4053cd16a31ecd77bdc726cfb... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-06-12 (Mon, 12 Jun 2017)

Changed paths: M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map

Log Message: ----------- Merge and repack.

Compare: https://github.com/galaxyproject/galaxy/compare/2178cffaed03...d36c4053cd16