MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/admin-retheme

Browse Source 
# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
This commit is contained in:
Dane Everitt
2017-03-03 17:35:04 -05:00
parent b301b89459 500cf7fdb3
commit 799f2ee6d9
22 changed files with 10923 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/plugins/minecraft/eula.js
View File

@@ -17,9 +17,9 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
$(window).load(function () {
$(document).ready(function () {
Socket.on('console', function (data) {
if (data.line.indexOf('You need to agree to the EULA in order to run the server') > -1) {
if (~data.line.indexOf('You need to agree to the EULA in order to run the server')) {
swal({
title: 'EULA Acceptance',
text: 'By pressing \'I Accept\' below you are indicating your agreement to the <a href="https://account.mojang.com/documents/minecraft_eula" target="_blank">Mojang EULA</a>.',