airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [41/42] airavata-php-gateway git commit: Merge branch 'master' into airavata-php-gateway-0.15-release
Date Mon, 13 Jul 2015 17:25:35 GMT
Merge branch 'master' into airavata-php-gateway-0.15-release

Conflicts:
	app/libraries/AppUtilities.php
	app/views/admin/manage-experiments.blade.php
	app/views/experiment/search.blade.php
	app/views/project/summary.blade.php


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

Branch: refs/heads/airavata-php-gateway-0.15-release
Commit: ac23deee47fa6c87105ecf7b25778c9c4b4652a7
Parents: 7b775c3 3f1fdd4
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Thu Jul 2 00:26:23 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Thu Jul 2 00:26:23 2015 +0530

----------------------------------------------------------------------
 app/controllers/AdminController.php             |  25 +-
 app/libraries/AdminUtilities.php                |  52 +-
 app/libraries/AppUtilities.php                  |   5 +
 app/libraries/ExperimentUtilities.php           |  17 +-
 app/routes.php                                  |   4 +
 app/views/admin/experiment-statistics.blade.php | 198 +++++++
 app/views/admin/manage-experiments.blade.php    | 580 ++++++++-----------
 app/views/experiment/search.blade.php           | 175 ++----
 .../partials/experiment-container.blade.php     |  92 +++
 app/views/project/summary.blade.php             |  64 +-
 10 files changed, 709 insertions(+), 503 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ac23deee/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------


Mime
View raw message