You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/02 17:23:01 UTC
[airavata-php-gateway] 14/14: Merge branch 'dreg-gateway' of
https://github.com/Danko-Lab/airavata-php-gateway into dreg-gateway
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch dreg-gateway
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit ee3df12bb6a375ff97a071201965074878ff1b9c
Merge: e52fc97 7768b4a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Jun 2 13:22:20 2019 -0400
Merge branch 'dreg-gateway' of https://github.com/Danko-Lab/airavata-php-gateway into dreg-gateway
app/libraries/CommonUtilities.php | 4 +-
app/libraries/FileTransfer.php | 113 ++++---
app/routes.php | 7 +-
app/views/account/dashboard.blade.php | 2 +-
app/views/experiment/create-complete.blade.php | 2 +-
app/views/experiment/create.blade.php | 2 +-
app/views/partials/experiment-info.blade.php | 89 +++++-
public/themes/dreg/assets/img/3d-number.jpg | Bin 0 -> 67965 bytes
public/themes/dreg/assets/img/dTOX-model.png | Bin 0 -> 99342 bytes
.../themes/dreg/assets/img/dreg-dtox-gateway.png | Bin 0 -> 132589 bytes
public/themes/dreg/assets/img/dreg.exp.summary.png | Bin 52211 -> 46929 bytes
public/themes/dreg/assets/img/dregicon.png | Bin 0 -> 2128 bytes
public/themes/dreg/assets/img/dtox.create.exp.png | Bin 0 -> 17154 bytes
public/themes/dreg/assets/img/dtox.create.exp2.png | Bin 0 -> 40049 bytes
public/themes/dreg/assets/img/failure1.png | Bin 0 -> 53330 bytes
public/themes/dreg/assets/img/failure2.png | Bin 0 -> 29925 bytes
public/themes/dreg/assets/img/failure3-reason.png | Bin 0 -> 15519 bytes
public/themes/dreg/assets/img/failure3.png | Bin 0 -> 32245 bytes
public/themes/dreg/assets/img/failure4-reason.png | Bin 0 -> 17034 bytes
public/themes/dreg/assets/img/n1.png | Bin 0 -> 15718 bytes
public/themes/dreg/assets/img/n2.png | Bin 0 -> 19546 bytes
public/themes/dreg/assets/img/n3.png | Bin 0 -> 22082 bytes
public/themes/dreg/assets/img/n4.png | Bin 0 -> 19153 bytes
public/themes/dreg/partials/about.blade.php | 23 +-
public/themes/dreg/partials/doc.blade.php | 286 ++++++++++++++++--
public/themes/dreg/partials/dtox-doc.blade.php | 331 +++++++++++++++++++++
public/themes/dreg/partials/faq.blade.php | 38 ++-
public/themes/dreg/partials/header.blade.php | 11 +-
public/themes/dreg/partials/software.blade.php | 64 ++++
public/themes/dreg/partials/template.blade.php | 152 +++++++---
30 files changed, 968 insertions(+), 156 deletions(-)
diff --cc app/views/partials/experiment-info.blade.php
index 046fb32,1e88c0b..867aeca
mode 100755,100644..100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php