Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ca2eb5b2a5a3b4e9a026806dc5f228fcce681379 https://github.com/galaxyproject/galaxy/commit/ca2eb5b2a5a3b4e9a026806dc5f22... Author: John Chilton jmchilton@gmail.com Date: 2017-11-24 (Fri, 24 Nov 2017)

Changed paths: M test/functional/tools/bibtex.xml M test/functional/tools/samples_tool_conf.xml M test/galaxy_selenium/navigation.yml M test/galaxy_selenium/smart_components.py M test/selenium_tests/test_tool_form.py

Log Message: ----------- Simple tool test for citations.

Commit: b3d06f481a5fa6c649cb1ea6709038041566b9c5 https://github.com/galaxyproject/galaxy/commit/b3d06f481a5fa6c649cb1ea670903... Author: John Chilton jmchilton@gmail.com Date: 2017-11-24 (Fri, 24 Nov 2017)

Changed paths: M client/galaxy/scripts/components/citations.vue

Log Message: ----------- Restore classes on citation switching buttons.

Commit: 95c0ff6bf9ae19374eb660731e42370157c366c6 https://github.com/galaxyproject/galaxy/commit/95c0ff6bf9ae19374eb660731e423... Author: John Chilton jmchilton@gmail.com Date: 2017-11-24 (Fri, 24 Nov 2017)

Changed paths: M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/bundled/masthead.bundled.js M static/scripts/bundled/viz.bundled.js M static/scripts/bundled/workflow.bundled.js

Log Message: ----------- Repack client.

Commit: 05ddc50c1a7b0989e100e7ca817a96bad3d68ad7 https://github.com/galaxyproject/galaxy/commit/05ddc50c1a7b0989e100e7ca817a9... Author: John Chilton jmchilton@gmail.com Date: 2017-11-24 (Fri, 24 Nov 2017)

Changed paths: M test/selenium_tests/test_tool_form.py

Log Message: ----------- Make test more robust - citations take a while to fetch from doi.

Commit: bb7d06f59ed20fcbef7ad36d06a1ec138fac7e96 https://github.com/galaxyproject/galaxy/commit/bb7d06f59ed20fcbef7ad36d06a1e... Author: John Chilton jmchilton@gmail.com Date: 2017-11-25 (Sat, 25 Nov 2017)

Changed paths: M test/selenium_tests/test_tool_form.py

Log Message: ----------- Pre-fetch citations in new test so available quickly at render time.

Commit: d8fe56c670ec78bb00e70d56cf59a895a1b8418b https://github.com/galaxyproject/galaxy/commit/d8fe56c670ec78bb00e70d56cf59a... Author: John Chilton jmchilton@gmail.com Date: 2017-11-27 (Mon, 27 Nov 2017)

Changed paths: M test/selenium_tests/test_tool_form.py

Log Message: ----------- Modify citations test to clarify some bugs.

Commit: 1385cf4f83ac508b997ca0cd2a3e893c69b84408 https://github.com/galaxyproject/galaxy/commit/1385cf4f83ac508b997ca0cd2a3e8... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-11-30 (Thu, 30 Nov 2017)

Changed paths: M client/galaxy/scripts/components/Citations.vue M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/bundled/masthead.bundled.js M static/scripts/bundled/viz.bundled.js M static/scripts/bundled/workflow.bundled.js M test/functional/tools/bibtex.xml M test/functional/tools/samples_tool_conf.xml M test/galaxy_selenium/navigation.yml M test/selenium_tests/test_tool_form.py

Log Message: ----------- Merge remote-tracking branch 'jmchilton/citations' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/5124c5610900...1385cf4f83ac