Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4e8e6a8f01219ef17409a5efe925ca07358939f3 https://github.com/galaxyproject/galaxy/commit/4e8e6a8f01219ef17409a5efe925c... Author: Martin Cech marten@bx.psu.edu Date: 2018-03-29 (Thu, 29 Mar 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js

Log Message: ----------- add link to ftp help to upload modal

Commit: aae2f1d85c0b3b81ebdd943685945b4204d6dba8 https://github.com/galaxyproject/galaxy/commit/aae2f1d85c0b3b81ebdd943685945... Author: Martin Cech marten@bx.psu.edu Date: 2018-03-30 (Fri, 30 Mar 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js M lib/galaxy/managers/configuration.py

Log Message: ----------- add note to FTP upload modal when oidc is enabled

Commit: fe78b5bd89a90b49de5cd95e7ee660296c95dc16 https://github.com/galaxyproject/galaxy/commit/fe78b5bd89a90b49de5cd95e7ee66... Author: vjalili jalili.vahid@gmail.com Date: 2018-03-30 (Fri, 30 Mar 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js

Log Message: ----------- Some updates to FTP-upload messages w.r.t OIDC-based log-ins.

Commit: 6bb404e7a6ff7485bb528f16692d13f916490a3b https://github.com/galaxyproject/galaxy/commit/6bb404e7a6ff7485bb528f16692d1... Author: Martin Cech marten@bx.psu.edu Date: 2018-04-10 (Tue, 10 Apr 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js

Log Message: ----------- Merge pull request #27 from VJalili/openid-ftp

Some updates to FTP-upload messages w.r.t OIDC-based log-ins.

Commit: c03b699f66ba0a96e8455cf2ac43f928385d3835 https://github.com/galaxyproject/galaxy/commit/c03b699f66ba0a96e8455cf2ac43f... Author: Martin Cech marten@bx.psu.edu Date: 2018-04-11 (Wed, 11 Apr 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js

Log Message: ----------- reword

Commit: 6ee1c44df765c060a8396e14c17639b4bd8d20d9 https://github.com/galaxyproject/galaxy/commit/6ee1c44df765c060a8396e14c1763... Author: Dannon dannon.baker@gmail.com Date: 2018-04-11 (Wed, 11 Apr 2018)

Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js M lib/galaxy/managers/configuration.py

Log Message: ----------- Merge pull request #5814 from martenson/openid-ftp

add note to FTP modal when oidc is enabled

Compare: https://github.com/galaxyproject/galaxy/compare/11204b176500...6ee1c44df765