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/c2768547 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c2768547 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c2768547 Branch: refs/heads/develop Commit: c276854740f990f74f430f531e9dee240eb03632 Parents: be74b86 396346f Author: scnakandala <[email protected]> Authored: Fri Apr 29 15:45:49 2016 -0400 Committer: scnakandala <[email protected]> Committed: Fri Apr 29 15:45:49 2016 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 5 + app/controllers/AdminController.php | 42 ++- app/libraries/AdminUtilities.php | 27 +- app/libraries/CommonUtilities.php | 76 ++++- app/routes.php | 14 +- app/views/admin/manage-credentials.blade.php | 53 --- app/views/admin/manage-notices.blade.php | 383 ++++++++++++++-------- app/views/layout/basic.blade.php | 9 + app/views/partials/dashboard-block.blade.php | 2 +- public/css/bootstrap.min.css | 35 +- 10 files changed, 431 insertions(+), 215 deletions(-) ----------------------------------------------------------------------
