Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 54173807e56e8ae4bef4cc0511249d6b87380de2 https://github.com/galaxyproject/galaxy/commit/54173807e56e8ae4bef4cc0511249... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py

Log Message: ----------- Re-use ``trans`` logic for calculating user_ftp_dir.

Commit: f95cbf8f38801f03ba1ea9c065bc1796253d6eaf https://github.com/galaxyproject/galaxy/commit/f95cbf8f38801f03ba1ea9c065bc1... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/managers/context.py

Log Message: ----------- More documentation and flexibility for configuring FTP imports.

- Add missing documentation for the ftp_upload_dir_identifier option. - Add ftp_upload_dir_template option to configure how to combine identifier and base directory to generate an ftp upload directory.

Commit: 997b53f3ae7586d4a2e90f6cb03f00b844bb4d42 https://github.com/galaxyproject/galaxy/commit/997b53f3ae7586d4a2e90f6cb03f0... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/parameters/grouping.py M tools/data_source/upload.py

Log Message: ----------- Implement option to prevent FTP uploads from being deleted on import.

- Simply set `ftp_upload_purge` to `False` in galaxy.ini to enable this. - xref http://dev.list.galaxyproject.org/Data-removal-after-ftp-import-td4667111.ht... - slight xref http://dev.list.galaxyproject.org/Uploading-files-to-galaxy-from-a-folder-td...

Commit: 3ce6fca52c1fce1027566d5dbc50811be614ca28 https://github.com/galaxyproject/galaxy/commit/3ce6fca52c1fce1027566d5dbc508... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M config/galaxy.ini.sample

Log Message: ----------- config doc fixes spotted by @nsoranzo

Commit: fbf894ef144101dec25237435040c82f945c3525 https://github.com/galaxyproject/galaxy/commit/fbf894ef144101dec25237435040c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/managers/context.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/webapps/galaxy/api/remote_files.py M tools/data_source/upload.py

Log Message: ----------- Merge pull request #2168 from jmchilton/ftp_upload

More documentation and flexibility for FTP imports.

Compare: https://github.com/galaxyproject/galaxy/compare/4ffee71969e7...fbf894ef1441