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/e675d4d6 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e675d4d6 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e675d4d6 Branch: refs/heads/master Commit: e675d4d6491e68d143452c7d47a81c81eeb0d7e6 Parents: dddb721 78cc9ab Author: scnakandala <[email protected]> Authored: Wed Jan 27 10:22:55 2016 -0500 Committer: scnakandala <[email protected]> Committed: Wed Jan 27 10:22:55 2016 -0500 ---------------------------------------------------------------------- app/controllers/AdminController.php | 17 +++++++ app/controllers/StorageResourceController.php | 2 +- app/libraries/ExperimentUtilities.php | 1 - app/routes.php | 6 ++- app/views/admin/manage-experiments.blade.php | 28 +++++------ app/views/partials/experiment-info.blade.php | 6 +-- app/views/project/summary.blade.php | 32 ++++++++++--- app/views/resource/browse.blade.php | 20 +------- app/views/resource/edit.blade.php | 17 ------- app/views/storage-resource/browse.blade.php | 55 ++++++++++++++++++---- app/views/storage-resource/edit.blade.php | 7 ++- public/js/script.js | 17 +++++++ public/js/time-conversion.js | 4 +- 13 files changed, 138 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e675d4d6/app/controllers/AdminController.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e675d4d6/app/controllers/StorageResourceController.php ----------------------------------------------------------------------
