Merge remote-tracking branch 'origin/develop' 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/e80f2a24 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e80f2a24 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e80f2a24 Branch: refs/heads/master Commit: e80f2a2419e8c94c9e03219f4146490bd2bc6456 Parents: 1384022 6b3c8f2 Author: scnakandala <[email protected]> Authored: Wed Jun 1 12:47:45 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jun 1 12:47:45 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 12 +- app/libraries/AdminUtilities.php | 14 +- app/libraries/CommonUtilities.php | 99 +++++++---- app/views/admin/manage-notices.blade.php | 172 +++++++++++-------- app/views/experiment/browse.blade.php | 1 - app/views/layout/basic.blade.php | 1 + .../compute-resource-preferences.blade.php | 1 + public/css/bootstrap.min.css | 18 +- public/js/time-conversion.js | 5 +- 9 files changed, 199 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
