:qMerge remote-tracking branch 'upstream/grouper-integration' into grouper-integration
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/8423f526 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8423f526 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8423f526 Branch: refs/heads/grouper-integration Commit: 8423f5264f19a944601d02200a3c536576ba0a1d Parents: 0ff0e89 a6659e7 Author: Jeff Kinnison <[email protected]> Authored: Fri Jul 8 11:12:49 2016 -0400 Committer: Jeff Kinnison <[email protected]> Committed: Fri Jul 8 11:12:49 2016 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 2 + app/controllers/ProjectController.php | 4 +- app/libraries/Airavata/API/Airavata.php | 12611 ++++++++--------- .../Model/AppCatalog/AppInterface/Types.php | 23 + .../Airavata/Model/Application/Io/Types.php | 10 +- .../Airavata/Model/Experiment/Types.php | 9 + app/libraries/Airavata/Model/User/Types.php | 1079 ++ .../Airavata/Model/Workspace/Types.php | 197 +- app/libraries/AppUtilities.php | 3 +- app/libraries/ExperimentUtilities.php | 205 +- app/libraries/GrouperUtilities.php | 68 + app/libraries/ProjectUtilities.php | 54 +- app/routes.php | 25 +- app/views/admin/manage-credentials.blade.php | 24 +- app/views/experiment/create-complete.blade.php | 11 + .../partials/experiment-container.blade.php | 10 +- app/views/partials/experiment-info.blade.php | 4 + app/views/partials/experiment-inputs.blade.php | 2 +- app/views/partials/interface-block.blade.php | 10 + app/views/project/browse.blade.php | 4 + app/views/project/summary.blade.php | 2 + public/js/time-conversion.js | 2 + 22 files changed, 7185 insertions(+), 7174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8423f526/app/routes.php ---------------------------------------------------------------------- diff --cc app/routes.php index cb7338e,cd0b20f..3a41c7b --- a/app/routes.php +++ b/app/routes.php @@@ -97,8 -97,8 +97,7 @@@ Route::get("experiment/browse", "Experi Route::post("experiment/browse", "ExperimentController@browseView"); - Route::get("download", function(){ - //FIXME check for no ../ parts in the path if(Input::has("path") && (0 == strpos(Input::get("path"), Session::get('username')) || 0 == strpos(Input::get("path"), "/" . Session::get('username')))){ $path = Input::get("path");
