Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 785f81989627db26b3799b0e6d5123213fcec9e4 https://github.com/galaxyproject/galaxy/commit/785f81989627db26b3799b0e6d512... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: A doc/source/dev/faq.rst A doc/source/dev/index.rst M doc/source/index.rst Log Message: ----------- Add developer documentation to docs Commit: 86c3175fcda4ff85505ecfcd78cf2b302909a7a7 https://github.com/galaxyproject/galaxy/commit/86c3175fcda4ff85505ecfcd78cf2... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: A doc/source/_api_quickstart.rst A doc/source/api/quickstart.rst M doc/source/api_doc.rst M doc/source/ts_api_doc.rst Log Message: ----------- Extract quickstart, reorg GX/TS Doc index Commit: 0bfa99725463f1807816e5c0bdeacf46eb186c55 https://github.com/galaxyproject/galaxy/commit/0bfa99725463f1807816e5c0bdeac... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: R doc/source/_api_quickstart.rst Log Message: ----------- Remove unused file Commit: b6105acd2b7f0957c315a63bcf083a596189383b https://github.com/galaxyproject/galaxy/commit/b6105acd2b7f0957c315a63bcf083... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/dev/faq.rst Log Message: ----------- merge... Commit: f7a68ec29567a4dc3067ab0b3bccdc6c32c975d3 https://github.com/galaxyproject/galaxy/commit/f7a68ec29567a4dc3067ab0b3bccd... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M .gitignore M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/tools/tools-form-base.js M client/galaxy/scripts/mvc/tools/tools-jobs.js M config/galaxy.ini.sample M config/job_conf.xml.sample_advanced M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M lib/galaxy/config.py M lib/galaxy/datatypes/binary.py M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/hdas.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/workflow/run.py M scripts/common_startup.sh M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/tools/tools-form-base.js.map M static/maps/mvc/tools/tools-jobs.js.map A static/maps/mvc/upload/upload-row.js.map M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/tools/tools-form-base.js M static/scripts/mvc/tools/tools-jobs.js A static/scripts/mvc/upload/upload-row.js A test-data/1.RData M test/api/helpers.py M test/api/test_dataset_collections.py M test/api/test_tools.py M test/api/test_workflows.py M test/base/test_data.py M test/base/twilltestcase.py M test/functional/tools/disambiguate_cond.xml M test/functional/tools/min_repeat.xml M test/functional/tools/samples_tool_conf.xml M test/functional/tools/validation_repeat.xml M test/unit/jobs/test_job_configuration.py R tool-data/shared/ucsc/manual_builds.txt A tool-data/shared/ucsc/manual_builds.txt.sample Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into dev Commit: 2166f876bc938e9837bbb974e24a670e1e12fe98 https://github.com/galaxyproject/galaxy/commit/2166f876bc938e9837bbb974e24a6... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: A doc/source/admin/index.rst A doc/source/admin/interactive_environments.png A doc/source/admin/interactive_environments.rst A doc/source/admin/interactive_environments.svg M doc/source/index.rst Log Message: ----------- First draft of GIE admin docs Commit: 79c75e6e21aa894c949540160d87f1b7a6c43b39 https://github.com/galaxyproject/galaxy/commit/79c75e6e21aa894c949540160d87f... Author: Bjoern Gruening <bjoern.gruening@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Added docker-on-another-host Commit: 94c61f9f7f31189f3d7d265cf94fab198f5007b8 https://github.com/galaxyproject/galaxy/commit/94c61f9f7f31189f3d7d265cf94fa... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Add long tutorial on how-to-GIE Commit: 4b8f9b22a54f828075a7b574762ef0fc19e500dd https://github.com/galaxyproject/galaxy/commit/4b8f9b22a54f828075a7b574762ef... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Correct highlighting, and small bugs/typos Commit: 6db64967197b0ee7dff6c4df31d6281c89294720 https://github.com/galaxyproject/galaxy/commit/6db64967197b0ee7dff6c4df31d62... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Correct docker_port/proxy_prefix Commit: ed0fefaa4339d8ec96e60c98befa3fa2e5ff07b4 https://github.com/galaxyproject/galaxy/commit/ed0fefaa4339d8ec96e60c98befa3... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Full list of env vars, more doc corrections Commit: 928345fad7aa16bd1c32133e9b571954faddd0f3 https://github.com/galaxyproject/galaxy/commit/928345fad7aa16bd1c32133e9b571... Author: Rémi Marenco <remi.marenco@gmail.com> Date: 2015-09-26 (Sat, 26 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Fixed the image to show up The .* did not do the trick, added the .png extension so we could see the image. There is still the "interactive_environments_success.png" missing though! If you want me to take the picture, I can. Just need to know exactly what you want to show :p Commit: 98601084ec7f130f0b7dd27354648afd24cb1e78 https://github.com/galaxyproject/galaxy/commit/98601084ec7f130f0b7dd27354648... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-09-26 (Sat, 26 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Merge pull request #11 from remimarenco/patch-1 Fixed the interactive_environments' image to show up Commit: 771376a742fc1a248cc2223acebb27f5fd24ba43 https://github.com/galaxyproject/galaxy/commit/771376a742fc1a248cc2223acebb2... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-26 (Sat, 26 Sep 2015) Changed paths: A doc/source/admin/interactive_environments_success.png Log Message: ----------- Added success picture Commit: e81517bb9cefb7e4ddab991d3da59ae63619fd81 https://github.com/galaxyproject/galaxy/commit/e81517bb9cefb7e4ddab991d3da59... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-26 (Sat, 26 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Merge branch 'gie-docs' of github.com:erasche/galaxy into gie-docs Commit: de03710756c1858b47802bae5b3d3d67fde248b7 https://github.com/galaxyproject/galaxy/commit/de03710756c1858b47802bae5b3d3... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Comment out default value Commit: 76db6d5274f7fd527d7e161b4ec21492176096f7 https://github.com/galaxyproject/galaxy/commit/76db6d5274f7fd527d7e161b4ec21... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M doc/source/admin/index.rst Log Message: ----------- Link to the wiki Commit: 86aa3ca22bb820e240642aca64131ff7a5350bd2 https://github.com/galaxyproject/galaxy/commit/86aa3ca22bb820e240642aca64131... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M doc/source/admin/index.rst M doc/source/index.rst Log Message: ----------- Document that this isn't the primary admin docs Commit: d8ce3c25df0e6f0e44278e2dadd771d2030ae087 https://github.com/galaxyproject/galaxy/commit/d8ce3c25df0e6f0e44278e2dadd77... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-30 (Wed, 30 Sep 2015) Changed paths: A doc/source/admin/index.rst A doc/source/admin/interactive_environments.png A doc/source/admin/interactive_environments.rst A doc/source/admin/interactive_environments.svg A doc/source/admin/interactive_environments_success.png M doc/source/dev/faq.rst M doc/source/index.rst Log Message: ----------- Merge pull request #803 from erasche/gie-docs Document GIEs Compare: https://github.com/galaxyproject/galaxy/compare/c7c269572e61...d8ce3c25df0e