Jakob Schrettenbrunner
|
3a88deb97a
|
Merge branch 'develop' into feature/new-theme
# Conflicts:
# .gitignore
# public/themes/pterodactyl/js/frontend/files/filemanager.min.js
# public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
# public/themes/pterodactyl/js/frontend/serverlist.js
# resources/themes/pterodactyl/server/files/list.blade.php
|
2017-03-03 23:08:24 +01:00 |
|
Dane Everitt
|
5f8572fe1a
|
Fix power button permissions checking
|
2017-02-17 19:37:35 -05:00 |
|
Dane Everitt
|
6148a3bb9b
|
Fix EULA checking
|
2017-02-16 14:56:27 -05:00 |
|
Jakob Schrettenbrunner
|
344e3b4330
|
add console notification on new output that is out of view
fix the revealing module pattern (browser cache 😒)
change graph colors to theme primary color
move Socket.on(‚console’) to console.js
|
2017-01-26 22:57:33 +01:00 |
|
Dane Everitt
|
bf7b58470a
|
Update copyright headers
|
2017-01-24 17:57:08 -05:00 |
|
Dane Everitt
|
042c28ca43
|
Add Socket.io alert
|
2017-01-18 21:12:58 -05:00 |
|
Jakob Schrettenbrunner
|
e075b9061e
|
replace {{ trans() }} with @lang()
|
2017-01-18 02:01:26 +01:00 |
|
Dane Everitt
|
515e543c7f
|
Add SFTP and Database management pages to new theme.
|
2017-01-15 20:28:54 -05:00 |
|
Dane Everitt
|
c7f3bb5112
|
New theme assigned to server console page.
|
2017-01-15 18:52:22 -05:00 |
|