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/26c67fca Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/26c67fca Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/26c67fca Branch: refs/heads/develop Commit: 26c67fca6b492c77f62cf348fb6573c14664a916 Parents: 8e2594a 7dcf7f9 Author: scnakandala <[email protected]> Authored: Tue Nov 17 15:20:36 2015 -0500 Committer: scnakandala <[email protected]> Committed: Tue Nov 17 15:20:36 2015 -0500 ---------------------------------------------------------------------- app/controllers/DatastorageController.php | 251 ++++++++ app/libraries/DSUtilities.php | 600 ++++++++++++++++++ app/routes.php | 27 + app/views/data-storage/browse.blade.php | 213 +++++++ app/views/data-storage/create.blade.php | 53 ++ app/views/data-storage/edit.blade.php | 836 +++++++++++++++++++++++++ app/views/data-storage/view.blade.php | 379 +++++++++++ app/views/resource/browse.blade.php | 106 +--- 8 files changed, 2387 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
