Merge branch 'master' into dreg-gateway

Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/95decff3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/95decff3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/95decff3

Branch: refs/heads/dreg-gateway
Commit: 95decff37b19b8921b6cef49851c21b99da954a6
Parents: e5286d2 aedf097
Author: Marcus Christie <machr...@iu.edu>
Authored: Tue Aug 8 17:17:22 2017 -0400
Committer: Marcus Christie <machr...@iu.edu>
Committed: Tue Aug 8 17:17:22 2017 -0400

----------------------------------------------------------------------
 app/config/app.php                              |   10 +-
 app/config/email_templates.json                 |  109 +
 app/config/email_templates.json.template        |   41 +
 app/config/pga_config.php.template              |   53 +-
 app/controllers/AccountController.php           |  410 +--
 app/controllers/AdminController.php             |  258 +-
 app/controllers/ComputeResourceController.php   |   24 +-
 app/controllers/ExperimentController.php        |  122 +-
 .../GatewayRequestUpdateController.php          |   67 +
 app/controllers/ProjectController.php           |    6 +-
 app/controllers/UserSettingsController.php      |   99 +
 app/filters.php                                 |    6 +-
 app/libraries/AdminUtilities.php                |  175 +-
 app/libraries/Airavata/API/Error/Types.php      |   82 +
 .../Airavata/Facades/IamAdminServices.php       |   16 +
 .../Airavata/Facades/TenantProfileServices.php  |   16 +
 .../Airavata/Facades/UserProfileServices.php    |   16 +
 .../Airavata/IamAdminServiceProvider.php        |   84 +
 .../Model/AppCatalog/AppDeployment/Types.php    |   25 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |  142 +-
 .../Airavata/Model/Application/Io/Types.php     |    6 +-
 .../Airavata/Model/Data/Replica/Types.php       |  572 ++--
 app/libraries/Airavata/Model/Dbevent/Types.php  |  573 ++++
 .../Airavata/Model/Messaging/Event/Types.php    |    2 +
 app/libraries/Airavata/Model/Tenant/Types.php   |  530 +++
 app/libraries/Airavata/Model/User/Types.php     |  279 +-
 .../Airavata/Model/Workspace/Types.php          |  135 +-
 .../Iam/Admin/Services/CPI/Error/Types.php      |   95 +
 .../Iam/Admin/Services/CPI/IamAdminServices.php | 3196 ++++++++++++++++++
 .../Service/Iam/Admin/Services/CPI/Types.php    |   33 +
 .../Service/Profile/Tenant/CPI/Error/Types.php  |   95 +
 .../Profile/Tenant/CPI/TenantProfileService.php | 2437 +++++++++++++
 .../Service/Profile/Tenant/CPI/Types.php        |   33 +
 .../Airavata/Service/Profile/Types.php          |   20 +
 .../Service/Profile/User/CPI/Error/Types.php    |   95 +
 .../Airavata/Service/Profile/User/CPI/Types.php |   33 +
 .../Profile/User/CPI/UserProfileService.php     | 2025 +++++++++++
 .../Airavata/TenantProfileServiceProvider.php   |   83 +
 .../Airavata/UserProfileServiceProvider.php     |   83 +
 app/libraries/AppUtilities.php                  |   21 +-
 app/libraries/CRUtilities.php                   |    4 +-
 app/libraries/CommonUtilities.php               |   90 +-
 app/libraries/EmailUtilities.php                |  169 +
 app/libraries/ExperimentUtilities.php           |   73 +-
 app/libraries/GrouperUtilities.php              |   37 +-
 app/libraries/IamAdminServicesUtilities.php     |   45 +
 .../Keycloak/API/BaseKeycloakAPIEndpoint.php    |   29 +
 app/libraries/Keycloak/API/RoleMapper.php       |  113 +
 app/libraries/Keycloak/API/Roles.php            |   37 +
 app/libraries/Keycloak/API/Users.php            |  115 +
 app/libraries/Keycloak/Facades/Keycloak.php     |   16 +
 app/libraries/Keycloak/Keycloak.php             |  449 +++
 .../Keycloak/KeycloakServiceProvider.php        |   71 +
 app/libraries/Keycloak/KeycloakUtil.php         |   38 +
 app/libraries/ProjectUtilities.php              |    8 +-
 app/libraries/SRUtilities.php                   |   29 -
 app/libraries/SharingUtilities.php              |   29 +-
 app/libraries/UserProfileUtilities.php          |   55 +
 .../security/incommon_rsa_server_ca.pem         |   34 +
 app/routes.php                                  |   23 +-
 app/storage/.gitignore                          |    0
 app/storage/cache/.gitignore                    |    0
 app/storage/logs/.gitignore                     |    0
 app/storage/meta/.gitignore                     |    0
 app/storage/sessions/.gitignore                 |    0
 app/storage/views/.gitignore                    |    0
 app/views/account/create.blade.php              |   65 +-
 app/views/account/dashboard.blade.php           |   88 +-
 app/views/account/forgot-password.blade.php     |   15 +
 app/views/account/login-desktop.blade.php       |   21 +
 app/views/account/login.blade.php               |   37 +-
 app/views/account/reset-password.blade.php      |   25 +-
 app/views/account/settings.blade.php            |   18 +
 app/views/account/update.blade.php              |  154 +
 .../account/user-profile-update-email.blade.php |   60 +
 app/views/account/user-profile.blade.php        |   73 +
 app/views/admin/create-gateway.blade.php        |  148 +
 app/views/admin/manage-gateway.blade.php        |  256 +-
 app/views/admin/manage-users.blade.php          |    9 +
 app/views/application/deployment.blade.php      |   19 +-
 app/views/experiment/create-complete.blade.php  |    4 +-
 app/views/experiment/edit.blade.php             |    4 +-
 app/views/home.blade.php                        |    6 +-
 app/views/layout/basic.blade.php                |    8 +-
 app/views/layout/desktop-login.blade.php        |  103 +
 app/views/layout/fixed-scripts.blade.php        |    8 +-
 app/views/partials/deployment-block.blade.php   |   45 +-
 app/views/partials/experiment-info.blade.php    |    4 -
 app/views/partials/experiment-inputs.blade.php  |    3 +-
 .../partials/experiment-queue-block.blade.php   |  185 +-
 .../gateway-preferences-block.blade.php         |    4 +-
 .../partials/interface-input-block.blade.php    |   28 +-
 .../partials/interface-output-block.blade.php   |   16 +-
 app/views/partials/login-external.blade.php     |    9 +
 app/views/partials/login-form.blade.php         |   47 +
 app/views/partials/queue-block.blade.php        |   36 +
 app/views/project/browse.blade.php              |    4 +-
 app/views/project/edit.blade.php                |   10 +-
 app/views/project/no-sharing-edit.blade.php     |    6 +-
 app/views/project/no-sharing-summary.blade.php  |   24 +-
 app/views/project/summary.blade.php             |   24 +-
 app/views/resource/edit.blade.php               |   20 +
 app/views/resource/view.blade.php               |   20 +
 public/assets/cilogon-logo-24x24-b.png          |  Bin 0 -> 936 bytes
 public/css/bootstrap.min.css                    |   34 +-
 public/js/deployment.js                         |   49 +
 public/js/time-conversion.js                    |    9 +-
 public/themes/base/partials/about.blade.php     |    0
 .../base/partials/documentation.blade.php       |    0
 public/themes/base/partials/header.blade.php    |   45 +
 110 files changed, 14058 insertions(+), 1256 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/libraries/CommonUtilities.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/routes.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/views/account/dashboard.blade.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/views/experiment/create-complete.blade.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --cc app/views/partials/experiment-info.blade.php
index 42ca2ad,b910aea..fdf6e55
mode 100755,100644..100755
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/views/partials/experiment-inputs.blade.php
----------------------------------------------------------------------
diff --cc app/views/partials/experiment-inputs.blade.php
index a8431b9,1318961..f245b19
mode 100755,100644..100755
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95decff3/app/views/partials/experiment-queue-block.blade.php
----------------------------------------------------------------------
diff --cc app/views/partials/experiment-queue-block.blade.php
index 4f94e14,b78d391..b78d391
mode 100755,100644..100755
--- a/app/views/partials/experiment-queue-block.blade.php
+++ b/app/views/partials/experiment-queue-block.blade.php

Reply via email to