5 Commits

Author	SHA1	Message	Date
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	99497adcb2	Show proper server status when viewing listing. ... closes #308	2017-02-17 20:34:57 -05:00
Jakob Schrettenbrunner	0c1559c922	convert frontend javascript into revealing module pattern	2017-01-27 00:44:28 +01:00
Dane Everitt	bf7b58470a	Update copyright headers	2017-01-24 17:57:08 -05:00
Dane Everitt	2fc852c6a4	Push 'Account' and 'Security' pages as well as 'My Servers'	2017-01-15 14:09:57 -05:00