Merge branch 'Stirling-Tools:main' into main

Author: chottuthejimmy

.github/labeler-config.yml

@@ -16,21 +16,27 @@ Java:
 
 Back End:
   - changed-files:
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/**/*'
     - any-glob-to-any-file: 'src/main/resources/settings.yml.template'
+    - any-glob-to-any-file: 'src/main/resources/application.properties'
     - any-glob-to-any-file: 'src/main/resources/banner.txt'
+    - any-glob-to-any-file: 'scripts/png_to_webp.py'
+    - any-glob-to-any-file: 'split_photos.py'
 
 Security:
   - changed-files:
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/AuthenticationType.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/provider/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AuthenticationType.java'
+    - any-glob-to-any-file: 'scripts/download-security-jar.sh'
 
 API:
   - changed-files:
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
+    - any-glob-to-any-file: 'scripts/png_to_webp.py'
+    - any-glob-to-any-file: 'split_photos.py'
 
 Documentation:
   - changed-files:
@@ -43,6 +49,9 @@ Docker:
     - any-glob-to-any-file: 'Dockerfile'
     - any-glob-to-any-file: 'Dockerfile-*'
     - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
+    - any-glob-to-any-file: 'scripts/init.sh'
+    - any-glob-to-any-file: 'scripts/init-without-ocr.sh'
+    - any-glob-to-any-file: 'scripts/installFonts.sh'
 
 Test:
   - changed-files:

.github/labels.yml

@@ -3,9 +3,12 @@
 #
 # The repository labels will be automatically configured using this file and
 # the GitHub Action https://github.com/marketplace/actions/github-labeler.
+- name: "Licenses"
+  color: "EDEDED"
+  from_name: "licenses"
 - name: "Back End"
   color: "20CE6C"
-  description: "Issues related to back-end development"
+  description: "Issues or pull requests related to back-end development"
   from_name: "Back end"
 - name: "Bug"
   description: "Something isn't working"
@@ -24,6 +27,7 @@
   from_name: "documentation"
 - name: "Done for next release"
   color: "0CDBD1"
+  description: "Items that are completed and will be included in the next release"
 - name: "Done"
   color: "60F13B"
 - name: "duplicate"
@@ -37,7 +41,7 @@
   description: "Fix needs to be confirmed"
 - name: "Front End"
   color: "BBD2F1"
-  description: "Issues related to front-end development"
+  description: "Issues or pull requests related to front-end development"
 - name: "github-actions"
   description: "Pull requests that update GitHub Actions code"
   color: "999999"
@@ -91,3 +95,16 @@
   description: "Testing-related issues or pull requests"
 - name: "Stale"
   color: "000000"
+  description: "Issues or pull requests that have become inactive"
+- name: "Priority: Critical"
+  color: "000000"
+  description: "Issues or pull requests with the highest priority"
+- name: "Priority: High"
+  color: "FF0000"
+  description: "Issues or pull requests with high priority"
+- name: "Priority: Medium"
+  color: "FFFF00"
+  description: "Issues or pull requests with medium priority"
+- name: "Priority: Low"
+  color: "00FF00"
+  description: "Issues or pull requests with low priority"

.github/pull_request_template.md

@@ -8,6 +8,8 @@ Closes #(issue_number)
 
 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
 - [ ] I have performed a self-review of my own code
+- [ ] I have attached images of the change if it is UI based
 - [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] If my code has heavily changed functionality I have updated relevant docs on [Stirling-PDFs doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
 - [ ] My changes generate no new warnings
 - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)

.github/scripts/gradle_to_chart.py

@@ -10,6 +10,7 @@ on:
 permissions:
   contents: read
   packages: write
+
 jobs:
   push:
     runs-on: ubuntu-latest
@@ -66,6 +67,7 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
@@ -93,6 +95,7 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
@@ -119,6 +122,7 @@ jobs:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}

.github/workflows/push-docker.yml

@@ -14,44 +14,6 @@ permissions:
   pull-requests: write
 
 jobs:
-  sync-versions:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: pip install pyyaml
-      - name: Sync versions
-        run: python .github/scripts/gradle_to_chart.py
-      - name: Set up git config
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-      - name: Run git add
-        run: |
-          git add .
-          git diff --staged --quiet || git commit -m ":floppy_disk: Sync Versions
-          > Made via sync_files.yml" || echo "no changes"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update files
-          committer: GitHub Action <[email protected]>
-          author: GitHub Action <[email protected]>
-          signoff: true
-          branch: sync_version
-          title: ":floppy_disk: Update Version"
-          body: |
-            Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
   sync-readme:
     runs-on: ubuntu-latest
     steps:

.github/workflows/sync_files.yml

@@ -4,6 +4,7 @@ bin/
 tmp/
 *.tmp
 *.bak
+*.exe
 *.swp
 *~.nib
 local.properties

.gitignore

@@ -1,6 +1,7 @@
 # New Database Backup and Import Functionality
 
-**Full activation will take place on approximately January 5th, 2025!**
+> [!IMPORTANT]
+> **Full activation will take place on approximately January 5th, 2025!**
 
 Why is the waiting time six months?