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

..

Allocation.php

Update doc blocks for all app/

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

APIKey.php

Improved logic for handling permissions on API routes.

2017-04-08 12:05:29 -04:00

APILog.php

Update doc blocks for all app/

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

APIPermission.php

Apply fixes from StyleCI (#372)

2017-04-09 19:16:39 -04:00

Checksum.php

Update copyright headers

2017-01-24 17:57:08 -05:00

Database.php

Update doc blocks for all app/

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

DatabaseHost.php

Move config::set calls into single helper function

2017-04-13 23:19:01 -04:00

Download.php

Update copyright headers

2017-01-24 17:57:08 -05:00

Location.php

Cleanup location model and controller for Admin.

2017-02-10 17:09:56 -05:00

Node.php

Update doc blocks for all app/

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

NodeConfigurationToken.php

Cleanup node routes, cleanup remote token

2017-03-03 23:14:25 -05:00

Pack.php

Update doc blocks for all app/

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

Permission.php

Update subusers view

2017-03-30 15:31:02 -04:00

Server.php

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

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

ServerVariable.php

Fix front and backend views with new service variable setups

2017-03-12 19:34:06 -04:00

Service.php

Add initial pack creation and overview pages

2017-03-14 21:18:36 -04:00

ServiceOption.php

Merge branch 'develop' into feature/option-scripts

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

ServiceVariable.php

Update doc blocks for all app/

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

Session.php

Update doc blocks for all app/

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

Subuser.php

Fix up email sending and add more notifications to the panel.

2017-02-17 19:23:27 -05:00

Task.php

Un-butcher task system.

2017-04-15 13:52:43 -04:00

TaskLog.php

Update doc blocks for all app/

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

User.php

Improve server and user model code to accept a specific user

2017-04-15 12:48:47 -04:00