Dane Everitt 8d24e5f168 Merge branch 'develop' into feature/option-scripts ...

# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php

2017-04-20 17:08:08 -04:00

..

BaseController.php

Update doc blocks for all app/

2017-03-19 19:36:50 -04:00

DatabaseController.php

Update doc blocks for all app/

2017-03-19 19:36:50 -04:00

LocationController.php

Update doc blocks for all app/

2017-03-19 19:36:50 -04:00

NodesController.php

Fix up routes and controller names

2017-04-09 19:13:22 -04:00

OptionController.php

Merge branch 'develop' into feature/option-scripts

2017-04-20 17:08:08 -04:00

PackController.php

Fix up routes and controller names

2017-04-09 19:13:22 -04:00

ServersController.php

Fix server deletion logic, and clean up suspend/unsuspend operations

2017-04-17 20:16:05 -04:00

ServiceController.php

Fix up routes and controller names

2017-04-09 19:13:22 -04:00

UserController.php

Display total servers user can access in the Admin CP

2017-04-13 23:49:47 -04:00