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

public/.htaccess

@@ -8,6 +8,10 @@
     # Redirect Trailing Slashes If Not A Folder...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule ^(.*)/$ /$1 [L,R=301]
+    
+    # Prevent stripping authorization headers
+    RewriteCond %{HTTP:Authorization} ^(.*)
+    RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
 
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d

public/js/phraseapp.js

@@ -0,0 +1,8 @@
+window.PHRASEAPP_CONFIG = {
+  projectId: '94f8b39450cd749ae9c3cc0ab8cdb61d'
+};
+(function() {
+    var phraseapp = document.createElement('script'); phraseapp.type = 'text/javascript'; phraseapp.async = true;
+    phraseapp.src = ['https://', 'phraseapp.com/assets/in-context-editor/2.0/app.js?', new Date().getTime()].join('');
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(phraseapp, s);
+})();

public/themes/pterodactyl/css/pterodactyl.css

@@ -20,10 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+ .login-box, .register-box {
+     width: 40%;
+     margin: 7% auto
+ }
 
-.login-box, .register-box {
-    width: 460px;
-}
+ @media (max-width:768px) {
+     .login-box, .register-box {
+         width: 90%;
+         margin-top: 20px
+     }
+ }
 
 .weight-100 {
     font-weight: 100;

public/themes/pterodactyl/js/frontend/files/src/contextmenu.js

@@ -85,6 +85,10 @@ class ContextMenuClass {
     rightClick() {
         $('[data-action="toggleMenu"]').on('mousedown', event => {
             event.preventDefault();
+            if ($(document).find('#fileOptionMenu').is(':visible')) {
+                $('body').trigger('click');
+                return;
+            }
             this.showMenu(event);
         });
         $('#file_listing > tbody td').on('contextmenu', event => {

public/themes/pterodactyl/js/frontend/serverlist.js

@@ -27,35 +27,47 @@ var ServerList = (function () {
         3: 'Stopping'
     };
 
-    function updateServerStatus () {
-        $('.dynamic-update').each(function (index, data) {
-            var element = $(this);
-            var serverShortUUID = $(this).data('server');
-            $.ajax({
-                type: 'GET',
-                url: Router.route('server.ajax.status', { server: serverShortUUID }),
-                timeout: 5000,
-                headers: {
-                    'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content'),
-                }
-            }).done(function (data) {
-                if (typeof data.status === 'undefined') {
-                    element.find('[data-action="status"]').html('<span class="label label-default">Error</span>');
-                    return;
-                }
-                switch (data.status) {
-                    case 0:
-                        element.find('[data-action="status"]').html('<span class="label label-danger">Offline</span>');
-                        break;
-                    case 1:
-                        element.find('[data-action="status"]').html('<span class="label label-success">Online</span>');
-                        break;
-                    case 2:
-                        element.find('[data-action="status"]').html('<span class="label label-info">Starting</span>');
-                        break;
-                    case 3:
-                        element.find('[data-action="status"]').html('<span class="label label-info">Stopping</span>');
-                        break;
+    $('.dynamic-update').each(function (index, data) {
+        var element = $(this);
+        var serverShortUUID = $(this).data('server');
+
+        $.ajax({
+            type: 'GET',
+            url: Router.route('server.ajax.status', { server: serverShortUUID }),
+            timeout: 5000,
+            headers: {
+                'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content'),
+            }
+        }).done(function (data) {
+            if (typeof data.status === 'undefined') {
+                element.find('[data-action="status"]').html('<span class="label label-default">Error</span>');
+                return;
+            }
+            switch (data.status) {
+                case 0:
+                    element.find('[data-action="status"]').html('<span class="label label-danger">Offline</span>');
+                    break;
+                case 1:
+                    element.find('[data-action="status"]').html('<span class="label label-success">Online</span>');
+                    break;
+                case 2:
+                    element.find('[data-action="status"]').html('<span class="label label-info">Starting</span>');
+                    break;
+                case 3:
+                    element.find('[data-action="status"]').html('<span class="label label-info">Stopping</span>');
+                    break;
+                case 20:
+                    element.find('[data-action="status"]').html('<span class="label label-warning">Installing</span>');
+                    break;
+                case 30:
+                    element.find('[data-action="status"]').html('<span class="label label-warning">Suspended</span>');
+                    break;
+            }
+            if (data.status > 0 && data.status < 4) {
+                var cpuMax = element.find('[data-action="cpu"]').data('cpumax');
+                var currentCpu = data.proc.cpu.total;
+                if (cpuMax !== 0) {
+                    currentCpu = parseFloat(((data.proc.cpu.total / cpuMax) * 100).toFixed(2).toString());
                 }
                 if (data.status !== 0) {
                     var cpuMax = element.find('[data-action="cpu"]').data('cpumax');