Skip to content

Commit

Permalink
Merge pull request #5 from uts-cic/staging-release
Browse files Browse the repository at this point in the history
TAp, Athanor multithreaded patch upgrade Acawriter, new profiles
  • Loading branch information
radhikavm authored Jul 11, 2018
2 parents 7a503d7 + e29a547 commit 9a5a629
Show file tree
Hide file tree
Showing 37 changed files with 1,823 additions and 784 deletions.
17 changes: 0 additions & 17 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
<?php
/**
* Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language governing permissions and
* limitations under the License.
*
* Contributors:
* UTS Connected Intelligence Centre
*/



namespace App\Http\Controllers;

Expand Down
15 changes: 0 additions & 15 deletions app/Http/Controllers/AnalyseController.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
<?php
/**
* Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language governing permissions and
* limitations under the License.
*
* Contributors:
* UTS Connected Intelligence Centre
*/

namespace App\Http\Controllers;

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/AssignmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct() {

public function index(){
//get all assignments belonging to the user
$assignments = User::find(Auth::user()->id)->assignments()->with('feature')->get();
$assignments = User::find(Auth::user()->id)->assignments()->with('feature')->orderBy('created_at','desc')->get();
$features_all = Feature::all();
$features = new \stdClass();

Expand Down
15 changes: 0 additions & 15 deletions app/Http/Controllers/DocumentController.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
<?php
/**
* Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language governing permissions and
* limitations under the License.
*
* Contributors:
* UTS Connected Intelligence Centre
*/

namespace App\Http\Controllers;

Expand Down
15 changes: 0 additions & 15 deletions app/Http/Controllers/ExampleController.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
<?php
/**
* Copyright (c) 2018 original UTS CIC. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language governing permissions and
* limitations under the License.
*
* Contributors:
* UTS Connected Intelligence Centre
*/

namespace App\Http\Controllers;

Expand Down
Loading

0 comments on commit 9a5a629

Please sign in to comment.