From: Dan Brown <redacted>
Date: Sun, 1 Dec 2024 13:06:43 +0000 (+0000)
Subject: Merge branch 'portazips' into development
X-Git-Tag: v24.12~1^2~21
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/fdbbcf2b8a088d50aa9fd427082ae8c5cf97fb56?hp=-c

Merge branch 'portazips' into development
---

fdbbcf2b8a088d50aa9fd427082ae8c5cf97fb56
diff --combined composer.json
index b9b5c9a04,3680a2c6a..b8d8da9e7
--- a/composer.json
+++ b/composer.json
@@@ -16,13 -16,14 +16,14 @@@
          "ext-json": "*",
          "ext-mbstring": "*",
          "ext-xml": "*",
+         "ext-zip": "*",
          "bacon/bacon-qr-code": "^3.0",
          "doctrine/dbal": "^3.5",
          "dompdf/dompdf": "^3.0",
          "guzzlehttp/guzzle": "^7.4",
          "intervention/image": "^3.5",
          "knplabs/knp-snappy": "^1.5",
 -        "laravel/framework": "^10.10",
 +        "laravel/framework": "^10.48.23",
          "laravel/socialite": "^5.10",
          "laravel/tinker": "^2.8",
          "league/commonmark": "^2.3",
diff --combined resources/js/components/index.ts
index 8ad5e14cb,24e60bd97..24e60bd97
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@@ -30,6 -30,7 +30,7 @@@ export {HeaderMobileToggle} from './hea
  export {ImageManager} from './image-manager';
  export {ImagePicker} from './image-picker';
  export {ListSortControl} from './list-sort-control';
+ export {LoadingButton} from './loading-button.ts';
  export {MarkdownEditor} from './markdown-editor';
  export {NewUserPassword} from './new-user-password';
  export {Notification} from './notification';
diff --combined resources/js/components/page-comments.js
index 3d7e1365f,63900888a..8f023836b
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@@ -1,5 -1,5 +1,5 @@@
  import {Component} from './component';
 -import {getLoading, htmlToDom} from '../services/dom';
 +import {getLoading, htmlToDom} from '../services/dom.ts';
  import {buildForInput} from '../wysiwyg-tinymce/config';
  
  export class PageComments extends Component {
@@@ -93,7 -93,6 +93,6 @@@
  
      updateCount() {
          const count = this.getCommentCount();
-         console.log('update count', count, this.container);
          this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
      }