Merge branch 'develop' of 
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop


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

Branch: refs/heads/develop
Commit: 926d55ac1f0a563bc818cd36499bcfc46d6a324e
Parents: f312af8 6254204
Author: Nipurn Doshi <nipunh...@gmail.com>
Authored: Thu Oct 13 12:19:36 2016 -0700
Committer: Nipurn Doshi <nipunh...@gmail.com>
Committed: Thu Oct 13 12:19:36 2016 -0700

----------------------------------------------------------------------
 app/controllers/ProjectController.php   |   2 +-
 app/libraries/Airavata/API/Airavata.php | 287 +++++++++++++++++++++++++++
 app/libraries/CRUtilities.php           |   1 +
 app/routes.php                          |   2 +-
 app/views/admin/manage-roles.blade.php  |  10 +-
 app/views/project/browse.blade.php      |   7 +-
 app/views/project/no-summary.blade.php  | 119 -----------
 app/views/project/summary.blade.php     | 119 +++++++++++
 8 files changed, 415 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


Reply via email to