Merge remote-tracking branch 'origin/master'
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/8eeb7be0 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8eeb7be0 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8eeb7be0 Branch: refs/heads/master Commit: 8eeb7be0f73da8c1cc8bf2dfdc7d46d8029074e1 Parents: 5091992 da61c98 Author: scnakandala <[email protected]> Authored: Fri Oct 30 17:26:09 2015 -0400 Committer: scnakandala <[email protected]> Committed: Fri Oct 30 17:26:09 2015 -0400 ---------------------------------------------------------------------- app/routes.php | 12 ++-- app/views/admin/manage-experiments.blade.php | 69 ++++++++++++++++++++--- app/views/layout/basic.blade.php | 6 +- app/views/layout/fixed-header.blade.php | 2 + app/views/partials/experiment-info.blade.php | 15 +++-- 5 files changed, 82 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8eeb7be0/app/views/partials/experiment-info.blade.php ----------------------------------------------------------------------
