airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [20/20] airavata-php-gateway git commit: Merge branch 'grouper-integration' of https://github.com/jeffkinnison/airavata-php-gateway into develop
Date Wed, 17 Aug 2016 15:33:07 GMT
Merge branch 'grouper-integration' of https://github.com/jeffkinnison/airavata-php-gateway
into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.


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/f5ff011a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f5ff011a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f5ff011a

Branch: refs/heads/develop
Commit: f5ff011aa83be1a11c9e26e0600f96822669e0b9
Parents: f2f22bd face8c5
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Aug 17 11:32:40 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Aug 17 11:32:40 2016 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php        | 163 +++++++++++++------
 app/controllers/ProjectController.php           |  83 ++++++++--
 app/libraries/ExperimentUtilities.php           |  31 ++--
 app/libraries/ProjectUtilities.php              |  23 ++-
 app/libraries/SharingUtilities.php              |  28 +++-
 app/routes.php                                  |   8 +
 app/views/experiment/create-complete.blade.php  |   1 +
 app/views/experiment/edit.blade.php             |   2 +
 .../partials/experiment-container.blade.php     |  16 +-
 app/views/partials/experiment-info.blade.php    |  12 ++
 app/views/partials/sharing-form-modal.blade.php |   2 +-
 app/views/project/browse.blade.php              |   4 +-
 app/views/project/edit.blade.php                |   3 +
 app/views/project/summary.blade.php             |  12 +-
 public/js/sharing/share.js                      |  77 ++++++---
 public/js/sharing/sharing_utils.js              |   8 +-
 16 files changed, 334 insertions(+), 139 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f5ff011a/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/ExperimentUtilities.php
index dfe5761,631cb98..a90ba2a
mode 100644,100755..100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f5ff011a/app/routes.php
----------------------------------------------------------------------
diff --cc app/routes.php
index 29e22a9,6008c15..e26eadf
mode 100644,100755..100755
--- a/app/routes.php
+++ b/app/routes.php

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f5ff011a/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------


Mime
View raw message