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

..

options

Initial implementation of option scripts on panel side.

2017-03-18 13:09:30 -04:00

functions.blade.php

Move and delete JS and such so that themes are cleaner

2017-03-18 19:03:25 -04:00

index.blade.php

move packs create button in top right corner

2017-03-18 21:27:31 +01:00

new.blade.php

Start push of service changes.

2017-03-10 18:25:12 -05:00

view.blade.php

Add function file editing, and move all service file items into database

2017-03-12 15:59:17 -04:00