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
..
adminlte	Cleaner navigation bar for logout/admin	2017-02-16 18:19:52 -05:00
animate	Add Socket.io alert	2017-01-18 21:12:58 -05:00
bootstrap	Initial change of theme.	2017-01-14 21:32:33 -05:00
bootstrap-notify	Add Socket.io alert	2017-01-18 21:12:58 -05:00
jquery	derp: add jquery 3.1.1 files	2017-01-29 01:21:04 +01:00
select2	Add support for creating files via file manager	2017-01-20 17:10:14 -05:00
siofu	Fix up most of the file manager	2017-01-19 16:58:57 -05:00
slimscroll	Push 'Account' and 'Security' pages as well as 'My Servers'	2017-01-15 14:09:57 -05:00
sweetalert	Add SFTP and Database management pages to new theme.	2017-01-15 20:28:54 -05:00