Skip to content

Commit

Permalink
Merge branch 'master' into v2024.12.06
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-developer authored Dec 6, 2024
2 parents 82c575c + 06d2461 commit 261322e
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 41 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,3 @@ for a list of changes in this release and all prior releases.
If you found this project useful, here's a link to send Thomas a cup of coffee :)

[![](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)

2 changes: 1 addition & 1 deletion html/documentation/changeLog.html
Original file line number Diff line number Diff line change
Expand Up @@ -1197,4 +1197,4 @@ <h2>0.1</h2>
</body>

</html>
<script> includeHTML(); </script>
<script> includeHTML(); </script>
2 changes: 1 addition & 1 deletion html/documentation/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -887,4 +887,4 @@ div.sticky {
}
.ml-5 {
margin-left: 3rem !important;
}
}
1 change: 0 additions & 1 deletion html/documentation/settings/allskyWebsite.html
Original file line number Diff line number Diff line change
Expand Up @@ -747,4 +747,3 @@ <h3><span class="settings editorSetting">homePage</span> settings</h3>
</body>
</html>
<script> includeHTML(); </script>

1 change: 0 additions & 1 deletion html/documentation/troubleshooting/other.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,3 @@ <h2>Images are corrupted</h2>
</body>
</html>
<script> includeHTML(); </script>

3 changes: 0 additions & 3 deletions html/includes/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ function DisplayModule() {
<div class="btn btn-lg navbar-btn" id="module-editor-save"><i class="fa-solid fa-floppy-disk"></i></div>
</div>
</li>
<li>
<div class="btn btn-lg navbar-btn" id="module-editor-new" data-toggle="tooltip" data-placement="top" data-container="body" title="Add A New Module"><i class="fa-solid fa-upload"></i></div>
</li>
<li class="btn-lg">
<form id="oe-item-list-edit-dialog-form" class="form-horizontal">
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion html/includes/save_file.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ function message_and_exit($status, $message)
echo "${status} $message";
exit;
}
?>
?>
30 changes: 0 additions & 30 deletions html/js/modules/modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -851,27 +851,6 @@ class MODULESEDITOR {
}
}

#uploadFile(form) {
$.LoadingOverlay('show');
$('#module-upload-dialog').modal('hide');

$.ajax({
type: 'POST',
url: 'includes/moduleutil.php?request=Upload',
data: new FormData(form),
contentType: false,
cache: false,
processData: false,
context: this
}).done(function () {
this.#buildUI();
}).fail(function () {
bootbox.alert('Failed to upload the plugin. Unable to move the file');
}).always(function () {
$.LoadingOverlay('hide');
});
}

#showDebug() {
$.ajax({
url: 'includes/moduleutil.php?request=Modules&event=' + this.#eventName,
Expand Down Expand Up @@ -1046,15 +1025,6 @@ class MODULESEDITOR {
}
});

$(document).on('click', '#module-editor-new', () => {
$('#module-upload-dialog').modal('show');
});

$('#module-upload-dialog-form').on('submit', (e) => {
e.preventDefault();
this.#uploadFile(e.target);
});

this.#buildUI();
}

Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3901,4 +3901,4 @@ else
fi

display_msg progress "\nEnjoy Allsky!\n"
exit_installation 0 "${STATUS_OK}" ""
exit_installation 0 "${STATUS_OK}" ""
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2024.12.06
v2024.12.06

0 comments on commit 261322e

Please sign in to comment.