airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [05/12] airavata-php-gateway git commit: Merge branch 'master' of https://github.com/SciGaP/laravel-pga
Date Thu, 09 Apr 2015 15:41:47 GMT
Merge branch 'master' of https://github.com/SciGaP/laravel-pga

Conflicts:
	app/libraries/utilities.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/76ed3c09
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/76ed3c09
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/76ed3c09

Branch: refs/heads/master
Commit: 76ed3c09fbf37b6565f6c08868ef9efad334efb3
Parents: 843af28
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Thu Mar 12 17:03:40 2015 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Thu Apr 9 11:36:17 2015 -0400

----------------------------------------------------------------------
 app/libraries/utilities.php | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/76ed3c09/app/libraries/utilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/utilities.php b/app/libraries/utilities.php
old mode 100755
new mode 100644
index 1631bb5..1424f7c
--- a/app/libraries/utilities.php
+++ b/app/libraries/utilities.php
@@ -1841,7 +1841,6 @@ public static function list_output_files($experiment, $expStatus)
                 echo '<p>' . $output->name  . ' : ' . '<a target="_blank"
                             href="' . str_replace(Utilities::$experimentDataPathAbsolute,
Constant::EXPERIMENT_DATA_ROOT, $output->value) . '">' . 
                             $outputPathArray[ sizeof( $outputPathArray) - 1] . ' <span
class="glyphicon glyphicon-new-window"></span></a></p>';
-            }
             elseif ($output->type == DataType::STRING)
             {
                 echo '<p>' . $output->value . '</p>';


Mime
View raw message