StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/vuejs

Browse source
This commit is contained in:
Dane Everitt 2018-12-16 14:20:35 -08:00
commit 21ffa08d66
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
54 changed files with 407 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/js/laroute.js
View file

File diff suppressed because one or more lines are too long

1
public/themes/pterodactyl/css/terminal.css
View file

@ -26,6 +26,7 @@
#terminal > .cmd {
padding: 1px 0;
word-wrap: break-word;
}
#terminal_input {

2
public/themes/pterodactyl/js/frontend/server.socket.js
View file

@ -30,7 +30,7 @@ var Server = (function () {
}
if (typeof io !== 'function') {
console.error('Socket.io is reqired to use this panel.');
console.error('Socket.io is required to use this panel.');
return;
}

2
public/themes/pterodactyl/js/plugins/minecraft/eula.js
View file

@ -55,7 +55,7 @@ $(document).ready(function () {
console.error(jqXHR);
swal({
title: 'Whoops!',
text: 'An error occured while attempting to set the EULA as accepted: ' . jqXHR.responseJSON.error,
text: 'An error occurred while attempting to set the EULA as accepted: ' + jqXHR.responseJSON.error,
type: 'error'
})
});

8
public/themes/pterodactyl/vendor/phraseapp/phraseapp.js vendored
View file

@ -1,8 +0,0 @@
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);
})();