Dane Everitt 800e2df6b2 Merge branch 'develop' into feature/api-v1 ... # Conflicts: # app/Contracts/Repository/RepositoryInterface.php # app/Repositories/Eloquent/EloquentRepository.php # app/Services/Nodes/NodeUpdateService.php # tests/Unit/Services/Nodes/NodeUpdateServiceTest.php		2018-01-10 20:55:22 -06:00
..
Files	Merge branch 'develop' into feature/api-v1	2018-01-10 20:55:22 -06:00
Settings	Cleanup frontend controllers and middleware	2017-10-27 21:42:53 -05:00
Tasks	Update schedule process to allow toggling/triggering via UI	2018-01-08 21:43:10 -06:00
ConsoleController.php	Fix incorrect CPU usage display for limited servers, closes #758	2017-11-26 13:17:40 -06:00
DatabaseController.php	Add support for changing the server default allocation as a normal user	2017-10-20 21:32:57 -05:00
SubuserController.php	Fix subuser URL redirect, closes #723	2017-11-05 12:42:58 -06:00