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
..
auth.php	Better 2FA implementation on logins	2017-02-01 22:58:48 -05:00
base.php	Much cleaner code for updating user details front-end	2017-01-22 16:16:43 -05:00
navigation.php	Fix up most of the file manager	2017-01-19 16:58:57 -05:00
pagination.php	Initial change of theme.	2017-01-14 21:32:33 -05:00
passwords.php	Apply fixes from StyleCI	2017-01-17 23:21:33 +00:00
server.php	redesign parts of the file manager	2017-01-27 00:44:59 +01:00
strings.php	Cleaner navigation bar for logout/admin	2017-02-16 18:19:52 -05:00
validation.php	Initial change of theme.	2017-01-14 21:32:33 -05:00