fixes

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # All PRs to V1 must be approved by Frooodle
-* @Frooodle @reecebrowne @Ludy87 @DarioGii
+* @Frooodle

.github/dependabot.yml

@@ -11,13 +11,7 @@ updates:
       interval: "weekly"
     open-pull-requests-limit: 10
     rebase-strategy: "auto"
-
   - package-ecosystem: "docker"
     directory: "/" # Location of Dockerfile
     schedule:
       interval: "weekly"
-
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly

.github/labeler-config.yml

@@ -30,8 +30,6 @@ Security:
     - 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'
-    - any-glob-to-any-file: '.github/workflows/dependency-review.yml'
-    - any-glob-to-any-file: '.github/workflows/scorecards.yml'
 
 API:
   - changed-files:
@@ -39,7 +37,6 @@ API:
     - 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'
-    - any-glob-to-any-file: '.github/workflows/swagger.yml'
 
 Documentation:
   - changed-files:
@@ -60,9 +57,6 @@ Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
     - any-glob-to-any-file: 'src/test**/*'
-    - any-glob-to-any-file: '.pre-commit-config'
-    - any-glob-to-any-file: '.github/workflows/pre_commit.yml'
-    - any-glob-to-any-file: '.github/workflows/scorecards.yml'
 
 Github:
   - changed-files:

.github/release.yml

@@ -9,7 +9,7 @@ changelog:
     - title: Bug Fixes
       labels:
         - Bug
-
+    
     - title: Enhancements
       labels:
         - enhancement
@@ -26,7 +26,7 @@ changelog:
     - title: Translation Changes
       labels:
         - Translation
-
+    
     - title: Other Changes
       labels:
         - "*"

.github/workflows/PR-Demo-Comment.yml

@@ -8,14 +8,14 @@ jobs:
   check-comment:
     runs-on: ubuntu-latest
     if: |
-      github.event.issue.pull_request &&
+      github.event.issue.pull_request && 
       (
       contains(github.event.comment.body, 'prdeploy') ||
       contains(github.event.comment.body, 'deploypr')
       )
-      &&
+      && 
       (
-        github.event.comment.user.login == 'frooodle' ||
+        github.event.comment.user.login == 'frooodle' || 
         github.event.comment.user.login == 'sf298' ||
         github.event.comment.user.login == 'Ludy87' ||
         github.event.comment.user.login == 'LaserKaspar' ||
@@ -28,14 +28,9 @@ jobs:
       pr_ref: ${{ steps.get-pr-info.outputs.ref }}
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Get PR data
         id: get-pr
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v7
         with:
           script: |
             const prNumber = context.payload.issue.number;
@@ -44,46 +39,41 @@ jobs:
 
       - name: Get PR repository and ref
         id: get-pr-info
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v7
         with:
           script: |
             const { owner, repo } = context.repo;
             const prNumber = context.payload.issue.number;
-
+            
             const { data: pr } = await github.rest.pulls.get({
               owner,
               repo,
               pull_number: prNumber,
             });
-
+            
             // For forks, use the full repository name, for internal PRs use the current repo
             const repository = pr.head.repo.fork ? pr.head.repo.full_name : `${owner}/${repo}`;
-
+            
             console.log(`PR Repository: ${repository}`);
             console.log(`PR Branch: ${pr.head.ref}`);
-
+            
             core.setOutput('repository', repository);
             core.setOutput('ref', pr.head.ref);
 
   deploy-pr:
     needs: check-comment
     runs-on: ubuntu-latest
-
+    
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Checkout PR
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
         with:
           repository: ${{ needs.check-comment.outputs.pr_repository }}
           ref: ${{ needs.check-comment.outputs.pr_ref }}
           token: ${{ secrets.GITHUB_TOKEN }}
-
+      
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -94,20 +84,20 @@ jobs:
           DOCKER_ENABLE_SECURITY: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Get version number
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Build and push PR-specific image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -156,10 +146,10 @@ jobs:
           ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
             # Create PR-specific directories
             mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}
-
+            
             # Move docker-compose file to correct location
             mv /tmp/docker-compose.yml /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/docker-compose.yml
-
+            
             # Start or restart the container
             cd /stirling/PR-${{ needs.check-comment.outputs.pr_number }}
             docker-compose pull
@@ -168,7 +158,7 @@ jobs:
 
       - name: Post deployment URL to PR
         if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v7
         with:
           script: |
             const { GITHUB_REPOSITORY } = process.env;

.github/workflows/PR-Demo-cleanup.yml

@@ -4,7 +4,9 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, closed]
 
-permissions: read-all
+permissions:
+  contents: write
+  pull-requests: write
 
 env:
   SERVER_IP: ${{ secrets.VPS_IP }}  # Add this to your GitHub secrets
@@ -13,17 +15,9 @@ env:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
     if: github.event.action == 'closed'
-
+    
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
@@ -36,20 +30,20 @@ jobs:
           CLEANUP_STATUS=$(ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
             if [ -d "/stirling/PR-${{ github.event.pull_request.number }}" ]; then
               echo "Found PR directory, proceeding with cleanup..."
-
+              
               # Stop and remove containers
               cd /stirling/PR-${{ github.event.pull_request.number }}
               docker-compose down || true
-
+              
               # Go back to root before removal
               cd /
-
+              
               # Remove PR-specific directories
               rm -rf /stirling/PR-${{ github.event.pull_request.number }}
-
+              
               # Remove the Docker image
               docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ github.event.pull_request.number }} || true
-
+              
               echo "PERFORMED_CLEANUP"
             else
               echo "PR directory not found, nothing to clean up"
@@ -57,7 +51,7 @@ jobs:
             fi
           ENDSSH
           )
-
+          
           if [[ $CLEANUP_STATUS == *"PERFORMED_CLEANUP"* ]]; then
             echo "cleanup_performed=true" >> $GITHUB_OUTPUT
           else
@@ -66,7 +60,7 @@ jobs:
 
       - name: Post cleanup notice to PR
         if: steps.cleanup.outputs.cleanup_performed == 'true'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v7
         with:
           script: |
             const { GITHUB_REPOSITORY } = process.env;

.github/workflows/auto-labeler.yml

@@ -3,23 +3,17 @@ on:
   pull_request_target:
     types: [opened, synchronize]
 
-permissions: read-all
-
 jobs:
   labeler:
-    runs-on: ubuntu-latest
     permissions:
+      contents: read
       pull-requests: write
+    runs-on: ubuntu-latest
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+      
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
       - name: Apply Labels
-        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        uses: actions/labeler@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler-config.yml

.github/workflows/build.yml

@@ -6,13 +6,13 @@ on:
   pull_request:
     branches: ["main"]
 
-permissions: read-all
-
 jobs:
   build:
     runs-on: ubuntu-latest
 
     permissions:
+      actions: read
+      contents: read
       security-events: write
 
     strategy:
@@ -21,30 +21,23 @@ jobs:
         jdk-version: [17, 21]
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk-version }}
           distribution: "temurin"
 
-      - name: Build with Gradle and no spring security
+      - name: Set up Gradle
-        run: ./gradlew clean build
+        uses: gradle/actions/setup-gradle@v4
-        env:
+        with:
-          DOCKER_ENABLE_SECURITY: false
+          gradle-version: 8.7
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-build-cache
 
-      - name: Build with Gradle and with spring security
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: true
-          
   docker-compose-tests:
     # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
     #     (github.event_name == 'pull_request' &&
@@ -63,22 +56,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
 
       - name: Set up Java 17
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "adopt"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Install Docker Compose
         run: |
@@ -86,7 +74,7 @@ jobs:
           sudo chmod +x /usr/local/bin/docker-compose
 
       - name: Set up Python
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 

.github/workflows/check_properties.yml

@@ -1,55 +1,42 @@
-name: Check Properties Files on PR
+name: Check Properties Files
 
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
     paths:
       - "src/main/resources/messages_*.properties"
-
+  push:
-permissions:
+    branches: ["main"]
-  contents: read # Allow read access to repository content
+    paths:
+      - "src/main/resources/messages_en_GB.properties"
 
 jobs:
   check-files:
     if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # Allow posting comments on issues/PRs
-      pull-requests: write
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Checkout main branch first
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main-branch
+          fetch-depth: 0
+
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+          path: pr-branch
+          fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
-      - name: Get PR data
+      - name: Install GitHub CLI
-        id: get-pr-data
+        run: sudo apt-get update && sudo apt-get install -y gh
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const prNumber = context.payload.pull_request.number;
-            const repoOwner = context.payload.repository.owner.login;
-            const repoName = context.payload.repository.name;
-            const branch = context.payload.pull_request.head.ref;
-
-            console.log(`PR Number: ${prNumber}`);
-            console.log(`Repo Owner: ${repoOwner}`);
-            console.log(`Repo Name: ${repoName}`);
-            console.log(`Branch: ${branch}`);
-
-            core.setOutput("pr_number", prNumber);
-            core.setOutput("repo_owner", repoOwner);
-            core.setOutput("repo_name", repoName);
-            core.setOutput("branch", branch);
-        continue-on-error: true
 
       - name: Fetch PR changed files
         id: fetch-pr-changes
@@ -57,125 +44,45 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo "Fetching PR changed files..."
+          cd pr-branch
+          gh repo set-default ${{ github.repository }}
+          # Store files in a safe way, only allowing valid properties files
           echo "Getting list of changed files from PR..."
-          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]+\.properties$' > changed_files.txt # Filter only matching property files
+          gh pr view ${{ github.event.pull_request.number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]+\.properties$' > ../changed_files.txt
+          cd ..
 
-      - name: Determine reference file test
+          echo "Processing changed files..."
+          mapfile -t CHANGED_FILES < changed_files.txt
+
+          CHANGED_FILES_STR="${CHANGED_FILES[*]}"
+          echo "CHANGED_FILES=${CHANGED_FILES_STR}" >> $GITHUB_ENV
+
+          echo "Changed files: ${CHANGED_FILES_STR}"
+
+      - name: Determine reference file
         id: determine-file
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        run: |
-        with:
+          echo "Determining reference file..."
-          script: |
+          if grep -Fxq "src/main/resources/messages_en_GB.properties" changed_files.txt; then
-            const fs = require("fs");
+              echo "Using PR branch reference file"
-            const path = require("path");
+              echo "REFERENCE_FILE=pr-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
+          else
+              echo "Using main branch reference file"
+              echo "REFERENCE_FILE=main-branch/src/main/resources/messages_en_GB.properties" >> $GITHUB_ENV
+          fi
 
-            const prNumber = ${{ steps.get-pr-data.outputs.pr_number }};
+      - name: Show REFERENCE_FILE
-            const repoOwner = "${{ steps.get-pr-data.outputs.repo_owner }}";
+        run: echo "Reference file is set to ${REFERENCE_FILE}"
-            const repoName = "${{ steps.get-pr-data.outputs.repo_name }}";
-
-            const prRepoOwner = "${{ github.event.pull_request.head.repo.owner.login }}";
-            const prRepoName = "${{ github.event.pull_request.head.repo.name }}";
-            const branch = "${{ steps.get-pr-data.outputs.branch }}";
-
-            console.log(`Determining reference file for PR #${prNumber}`);
-
-            // Validate inputs
-            const validateInput = (input, regex, name) => {
-              if (!regex.test(input)) {
-                throw new Error(`Invalid ${name}: ${input}`);
-              }
-            };
-
-            validateInput(repoOwner, /^[a-zA-Z0-9_-]+$/, "repository owner");
-            validateInput(repoName, /^[a-zA-Z0-9._-]+$/, "repository name");
-            validateInput(branch, /^[a-zA-Z0-9._/-]+$/, "branch name");
-
-            // Get the list of changed files in the PR
-            const { data: files } = await github.rest.pulls.listFiles({
-              owner: repoOwner,
-              repo: repoName,
-              pull_number: prNumber,
-            });
-
-            // Filter for relevant files based on the PR changes
-            const changedFiles = files
-              .map(file => file.filename)
-              .filter(file => /^src\/main\/resources\/messages_[a-zA-Z_]+\.properties$/.test(file));
-
-            console.log("Changed files:", changedFiles);
-
-            // Create a temporary directory for PR files
-            const tempDir = "pr-branch";
-            if (!fs.existsSync(tempDir)) {
-              fs.mkdirSync(tempDir, { recursive: true });
-            }
-
-            // Download and save each changed file
-            for (const file of changedFiles) {
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: file,
-                ref: branch,
-              });
-
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              const filePath = path.join(tempDir, file);
-              const dirPath = path.dirname(filePath);
-
-              if (!fs.existsSync(dirPath)) {
-                fs.mkdirSync(dirPath, { recursive: true });
-              }
-
-              fs.writeFileSync(filePath, content);
-              console.log(`Saved file: ${filePath}`);
-            }
-
-            // Output the list of changed files for further processing
-            const fileList = changedFiles.join(" ");
-            core.exportVariable("FILES_LIST", fileList);
-            console.log("Files saved and listed in FILES_LIST.");
-
-            // Determine reference file
-            let referenceFilePath;
-            if (changedFiles.includes("src/main/resources/messages_en_GB.properties")) {
-              console.log("Using PR branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: branch,
-              });
-
-              referenceFilePath = "pr-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            } else {
-              console.log("Using main branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: repoOwner,
-                repo: repoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: "main",
-              });
-
-              referenceFilePath = "main-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            }
-
-            console.log(`Reference file path: ${referenceFilePath}`);
-            core.exportVariable("REFERENCE_FILE", referenceFilePath);
 
       - name: Run Python script to check files
         id: run-check
         run: |
           echo "Running Python script to check files..."
-          python .github/scripts/check_language_properties.py \
+          python main-branch/.github/scripts/check_language_properties.py \
             --actor ${{ github.event.pull_request.user.login }} \
             --reference-file "${REFERENCE_FILE}" \
-            --branch "pr-branch" \
+            --branch pr-branch \
-            --files "${FILES_LIST[@]}" > result.txt
+            --files "${CHANGED_FILES[@]}" > result.txt || true
-        continue-on-error: true # Continue the job even if this step fails
 
       - name: Capture output
         id: capture-output
@@ -188,7 +95,7 @@ jobs:
             echo "EOF" >> $GITHUB_ENV
             echo "${SCRIPT_OUTPUT}"
 
-            # Determine job failure based on script output
+            # Set FAIL_JOB to true if SCRIPT_OUTPUT contains ❌
             if [[ "$SCRIPT_OUTPUT" == *"❌"* ]]; then
               echo "FAIL_JOB=true" >> $GITHUB_ENV
             else
@@ -202,23 +109,23 @@ jobs:
 
       - name: Post comment on PR
         if: env.SCRIPT_OUTPUT != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v7
         with:
           script: |
             const { GITHUB_REPOSITORY, SCRIPT_OUTPUT } = process.env;
             const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const issueNumber = context.issue.number;
+            const prNumber = context.issue.number;
 
             // Find existing comment
             const comments = await github.rest.issues.listComments({
               owner: repoOwner,
               repo: repoName,
-              issue_number: issueNumber
+              issue_number: prNumber
             });
 
             const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
 
-            // Only update or create comments by the action user
+            // Only allow the action user to update comments
             const expectedActor = "github-actions[bot]";
 
             if (comment && comment.user.login === expectedActor) {
@@ -235,7 +142,7 @@ jobs:
               await github.rest.issues.createComment({
                 owner: repoOwner,
                 repo: repoName,
-                issue_number: issueNumber,
+                issue_number: prNumber,
                 body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
               });
               console.log("Created new comment.");
@@ -248,3 +155,59 @@ jobs:
         run: |
           echo "Failing the job because errors were detected."
           exit 1
+
+  update-translations-main:
+    if: github.event_name == 'push'
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Run Python script to check files
+        id: run-check
+        run: |
+          echo "Running Python script to check files..."
+          python .github/scripts/check_language_properties.py \
+            --reference-file src/main/resources/messages_en_GB.properties \
+            --branch main
+
+      - 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: Add translation keys
+        run: |
+          git add src/main/resources/messages_*.properties
+          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
+
+      - name: Create Pull Request
+        id: cpr
+        if: env.CHANGES_DETECTED == 'true'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "Update translation files"
+          committer: GitHub Action <action@github.com>
+          author: GitHub Action <action@github.com>
+          signoff: true
+          branch: update_translation_files
+          title: "Update translation files"
+          add-paths: |
+            src/main/resources/messages_*.properties
+          body: |
+            Auto-generated by [create-pull-request][1]
+
+            [1]: https://github.com/peter-evans/create-pull-request
+          labels: Translation
+          draft: false
+          delete-branch: true
+          sign-commits: true

.github/workflows/codeql.yml-disabled

@@ -1,79 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-#disable for now
-#on:
-#  push:
-#    branches: ["main"]
-#  pull_request:
-    # The branches below must be a subset of the branches above
-#    branches: ["main"]
-#  schedule:
-#    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["java"]
-        # CodeQL supports [ $supported-codeql-languages ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -1,27 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: 'Dependency Review'
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - name: 'Checkout Repository'
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

.github/workflows/licenses-update.yml

@@ -7,30 +7,25 @@ on:
     paths:
       - "build.gradle"
 
-permissions: read-all
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   generate-license-report:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
 
+    steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "adopt"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@v4
 
       - name: Run Gradle Command
         run: ./gradlew clean generateLicenseReport
@@ -52,7 +47,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update 3rd Party Licenses"
@@ -65,10 +60,9 @@ jobs:
             Auto-generated by [create-pull-request][1]
 
             [1]: https://github.com/peter-evans/create-pull-request
-          labels: licenses,github-actions
+          labels: licenses
           draft: false
           delete-branch: true
-          sign-commits: true
 
       - name: Auto approve
         if: steps.cpr.outputs.pull-request-operation == 'created'
@@ -78,7 +72,7 @@ jobs:
 
       - name: Enable auto-merge
         if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@a660677d5469627102a1c1e11409dd063606628d # v3.0.0
+        uses: peter-evans/enable-pull-request-automerge@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}

.github/workflows/manage-label.yml

@@ -4,26 +4,21 @@ on:
   schedule:
     - cron: "30 20 * * *"
 
-permissions: read-all
+permissions:
+  contents: read
+  issues: write
 
 jobs:
   labeler:
     name: Labeler
     runs-on: ubuntu-latest
-    permissions:
-      issues: write
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
 
       - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # v5.1.0
+        uses: crazy-max/ghaction-github-labeler@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           yaml-file: .github/labels.yml
-          skip-delete: true
+          skip-delete: true

.github/workflows/multiOSReleases.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
   release:
     types: [created]
-
+permissions:
-permissions: read-all
+  contents: write
-
+  packages: write
 jobs:
   build-installers:
     strategy:
@@ -22,25 +22,17 @@ jobs:
          #  platform: linux
          #  ext: deb
     runs-on: ${{ matrix.os }}
-    permissions:
+    
-      contents: write
-      packages: write
-
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up JDK 21
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: 8.7
 
@@ -50,7 +42,7 @@ jobs:
         run: |
           curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
           .\wix.exe /install /quiet
-
+          
       # Install Linux dependencies
       - name: Install Linux Dependencies
         if: matrix.os == 'ubuntu-latest'
@@ -91,14 +83,14 @@ jobs:
 
       # Upload installer as artifact for testing
       - name: Upload Installer Artifact
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@v4
-        with:
+        with:    
           name: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
           path: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
           retention-days: 1
           if-no-files-found: error
 
       - name: Upload binaries to release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@v2
         with:
           files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}

.github/workflows/pre_commit.yml

@@ -1,54 +0,0 @@
-name: Pre-commit
-
-on:
-  push:
-    branches: [main]
-
-permissions: read-all
-
-jobs:
-  update:
-    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-      - name: Run Pre-Commit Hooks
-        uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        continue-on-error: true
-      - 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: git add
-        run: |
-          git add .
-          git diff --staged --quiet || git commit -m ":file_folder: pre-commit
-          > Made via .github/workflows/pre_commit.yml" || echo "pre-commit: no changes"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "ci: 🤖 format everything with pre-commit"
-          committer: GitHub Action <action@github.com>
-          author: GitHub Action <action@github.com>
-          signoff: true
-          branch: pre-commit
-          title: "🤖 format everything with pre-commit by <github-actions[bot]>"
-          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
-          sign-commits: true

.github/workflows/push-docker.yml

@@ -10,28 +10,20 @@ on:
 permissions:
   contents: read
   packages: write
-  id-token: write
 
 jobs:
   push:
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: 8.7
 
@@ -40,35 +32,29 @@ jobs:
         env:
           DOCKER_ENABLE_SECURITY: false
 
-      - name: Install cosign
-        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@v3.7.0
-        with:
-          cosign-release: 'v2.4.1'
-
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Get version number
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+        uses: docker/setup-qemu-action@v3
 
       - name: Convert repository owner to lowercase
         id: repoowner
@@ -76,7 +62,7 @@ jobs:
 
       - name: Generate tags
         id: meta
-        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -89,8 +75,7 @@ jobs:
             type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push main Dockerfile
-        id: build-push-regular
+        uses: docker/build-push-action@v6
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -102,26 +87,10 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign regular images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-regular.outputs.digest }}
-          TAGS: ${{ steps.meta.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --yes \
-              --key env://COSIGN_PRIVATE_KEY \
-              "${tag}@${DIGEST}"
-          done
 
       - name: Generate tags ultra-lite
         id: meta2
-        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
+        uses: docker/metadata-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           images: |
@@ -134,12 +103,11 @@ jobs:
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push Dockerfile-ultra-lite
-        id: build-push-lite
+        uses: docker/build-push-action@v6
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         if: github.ref != 'refs/heads/main'
         with:
           context: .
-          file: ./Dockerfile.ultra-lite
+          file: ./Dockerfile-ultra-lite
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -147,12 +115,10 @@ jobs:
           labels: ${{ steps.meta2.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
 
       - name: Generate tags fat
         id: meta3
-        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
+        uses: docker/metadata-action@v5
         if: github.ref != 'refs/heads/main'
         with:
           images: |
@@ -165,13 +131,12 @@ jobs:
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push main Dockerfile fat
-        id: build-push-fat
+        uses: docker/build-push-action@v6
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         if: github.ref != 'refs/heads/main'
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
-          file: ./Dockerfile.fat
+          file: ./Dockerfile-fat
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -179,17 +144,3 @@ jobs:
           labels: ${{ steps.meta3.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign fat images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-fat.outputs.digest }}
-          TAGS: ${{ steps.meta3.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --key env://COSIGN_PRIVATE_KEY --yes "${tag}@${DIGEST}"
-          done

.github/workflows/releaseArtifacts.yml

@@ -4,15 +4,12 @@ on:
   workflow_dispatch:
   release:
     types: [created]
-
+permissions:
-permissions: read-all
+  contents: write
-
+  packages: write
 jobs:
   push:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
     strategy:
       matrix:
         enable_security: [true, false]
@@ -22,20 +19,15 @@ jobs:
           - enable_security: false
             file_suffix: ""
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: 8.7
 
@@ -53,16 +45,16 @@ jobs:
         run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
 
       - name: Upload Assets binarie
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@v4
         with:
           path: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
           name: Stirling-PDF-Server${{ matrix.file_suffix }}.exe
           overwrite: true
           retention-days: 1
           if-no-files-found: error
-
+          
       - name: Upload binaries to release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@v2
         with:
           files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
 
@@ -70,7 +62,7 @@ jobs:
         run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
 
       - name: Upload Assets jar binaries
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@v4
         with:
           path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
           name: Stirling-PDF${{ matrix.file_suffix }}.jar
@@ -79,6 +71,6 @@ jobs:
           if-no-files-found: error
 
       - name: Upload jar binaries to release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@v2
         with:
           files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar

.github/workflows/scorecards.yml

@@ -1,79 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '20 7 * * 2'
-  push:
-    branches: ["main"]
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      contents: read
-      actions: read
-      # To allow GraphQL ListCommits to work
-      issues: read
-      pull-requests: read
-      # To detect SAST tools
-      checks: read
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecards on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          sarif_file: results.sarif

.github/workflows/stale.yml

@@ -5,8 +5,6 @@ on:
     - cron: "30 0 * * *"
   workflow_dispatch:
 
-permissions: read-all
-
 jobs:
   stale:
     runs-on: ubuntu-latest
@@ -14,13 +12,8 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
       - name: 30 days stale issues
-        uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+        uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

.github/workflows/swagger.yml

@@ -6,26 +6,19 @@ on:
     branches:
       - master
 
-permissions: read-all
-
 jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@v4
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/sync_files.yml

@@ -9,23 +9,17 @@ on:
       - "src/main/resources/messages_*.properties"
       - "scripts/ignore_translation.toml"
 
-permissions: read-all
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   sync-readme:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
     steps:
-      - name: Harden Runner
+      - uses: actions/checkout@v4
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Python
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Install dependencies
@@ -42,7 +36,7 @@ jobs:
           git diff --staged --quiet || git commit -m ":memo: Sync README
           > Made via sync_files.yml" || echo "no changes"
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update files
@@ -58,4 +52,3 @@ jobs:
           draft: false
           delete-branch: true
           labels: Documentation,Translation,github-actions
-          sign-commits: true

.github/workflows/update-translations.yml

@@ -1,71 +0,0 @@
-name: Update Translations
-
-on:
-  push:
-    branches: ["main"]
-    paths:
-      - "src/main/resources/messages_en_GB.properties"
-
-permissions: read-all
-
-jobs:
-  update-translations-main:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Python
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
-        with:
-          python-version: "3.x"
-
-      - name: Run Python script to check files
-        id: run-check
-        run: |
-          echo "Running Python script to check files..."
-          python .github/scripts/check_language_properties.py \
-            --reference-file src/main/resources/messages_en_GB.properties \
-            --branch main
-
-      - 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: Add translation keys
-        run: |
-          git add src/main/resources/messages_*.properties
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        id: cpr
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update translation files"
-          committer: GitHub Action <action@github.com>
-          author: GitHub Action <action@github.com>
-          signoff: true
-          branch: update_translation_files
-          title: "Update translation files"
-          add-paths: |
-            src/main/resources/messages_*.properties
-          body: |
-            Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: Translation,github-actions
-          sign-commits: true

.gitignore

@@ -146,37 +146,19 @@ out/
 # cucumber
 /cucumber/reports/**
 
-# Certs and Security Files
+# Certs
 *.p12
-*.pk8
 *.pem
 *.crt
 *.cer
-*.cert
 *.der
 *.key
 *.csr
-*.kdbx
-*.jks
-*.asc
-
-# SSH Keys
-*.pub
-*.priv
-id_rsa
-id_rsa.pub
-id_ecdsa
-id_ecdsa.pub
-id_ed25519
-id_ed25519.pub
-.ssh/
-*ssh
 
 # cache
-.cache
 .ruff_cache
 .mypy_cache
 .pytest_cache
 .ipynb_checkpoints
 
-**/jcef-bundle/
+**/jcef-bundle/

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.2.1
     hooks:
       - id: ruff
         args:
@@ -12,7 +12,7 @@ repos:
         files: ^((.github/scripts|scripts)/.+)?[^/]+\.py$
         exclude: (split_photos.py)
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.2.6
     hooks:
       - id: codespell
         args:
@@ -21,25 +21,6 @@ repos:
           - --quiet-level=2
         files: \.(properties|html|css|js|py|md)$
         exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile)
-  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.22.0
-    hooks:
-      - id: gitleaks
-  - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 3.0.0
-    hooks:
-      - id: shellcheck
-        files: ^.*(\.bash|\.sh|\.ksh|\.zsh)$
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      - id: end-of-file-fixer
-        files: ^.*(\.js|\.java|\.py|\.yml)$
-        exclude: ^(.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js$)
-      - id: trailing-whitespace
-        files: ^.*(\.js|\.java|\.py|\.yml)$
-        exclude: ^(.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js$)
-
   - repo: local
     hooks:
       - id: check-duplicate-properties-keys
@@ -47,11 +28,12 @@ repos:
         entry: python .github/scripts/check_duplicates.py
         language: python
         files: ^(src)/.+\.properties$
+  - repo: local
+    hooks:
       - id: check-html-tabs
         name: Check HTML for tabs
-        description: Ensures HTML/CSS/JS files do not contain tab characters
         # args: ["--replace_with=  "]
         entry: python .github/scripts/check_tabulator.py
         language: python
-        exclude: ^(.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js$)
+        exclude: ^(src/main/resources/static/pdfjs|src/main/resources/static/pdfjs-legacy)
-        files: ^.*(\.html|\.css|\.js)$
+        files: ^.*(\.html|\.css|\.js)$

CONTRIBUTING.md

@@ -18,9 +18,9 @@ For a detailed pull request tutorial, see [this guide](https://www.digitalocean.
 Please make sure your Pull Request adheres to the following guidelines:
 
 - Use the PR template provided.
-- Keep your Pull Request title succinct, detailed, and to the point.
+- Keep your Pull Request title succinct, detailed and to the point.
 - Keep commits atomic. One commit should contain one change. If you want to make multiple changes, submit multiple Pull Requests.
-- Commits should be clear, concise, and easy to understand.
+- Commits should be clear, concise and easy to understand.
 - References to the Issue number in the Pull Request and/or Commit message.
 
 ## Translations
@@ -29,15 +29,15 @@ If you would like to add or modify a translation, please see [How to add new lan
 
 ## Docs
 
-Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use the "edit this page"-button at the bottom of each page at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/).
+Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/).
 
 ## Fixing Bugs or Adding a New Feature
 
 First, make sure you've read the section [Pull Requests](#pull-requests).
 
-If, at any point in time, you have a question, please feel free to ask in the same issue thread or in our [Discord](https://discord.gg/FJUSXUSYec).
+To build from source, please follow this [Guide](LocalRunGuide.md).
 
-Developers should review our [Developer Guide](DeveloperGuide.md)
+If, at any point of time, you have a question, please feel free to ask in the same issue thread or in our [Discord](https://discord.gg/FJUSXUSYec).
 
 ## License
 

DeveloperGuide.md

@@ -2,7 +2,7 @@
 
 ## 1. Introduction
 
-Stirling-PDF is a robust, locally hosted, web-based PDF manipulation tool. This guide focuses on Docker-based development and testing, which is the recommended approach for working with the full version of Stirling-PDF.
+Stirling-PDF is a robust, locally hosted web-based PDF manipulation tool. This guide focuses on Docker-based development and testing, which is the recommended approach for working with the full version of Stirling-PDF.
 
 ## 2. Project Overview
 
@@ -25,7 +25,7 @@ Stirling-PDF is built using:
 - Docker
 - Git
 - Java JDK 17 or later
-- Gradle 7.0 or later (Included within the repo)
+- Gradle 7.0 or later (Included within repo)
 
 ### Setup Steps
 
@@ -38,14 +38,14 @@ Stirling-PDF is built using:
 
 2. Install Docker and JDK17 if not already installed.
 
-3. Install a recommended Java IDE such as Eclipse, IntelliJ, or VSCode
+3. Install a recommended Java IDE such as Eclipse, IntelliJ or VSCode
 
 4. Lombok Setup
 Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, don't support Lombok out of the box. To set up Lombok in your development environment:
 Visit the [Lombok website](https://projectlombok.org/setup/) for installation instructions specific to your IDE.
 
 5. Add environment variable
-For local testing, you should generally be testing the full 'Security' version of Stirling-PDF. To do this, you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step.
+For local testing you should generally be testing the full 'Security' version of Stirling-PDF to do this you must add the environment flag DOCKER_ENABLE_SECURITY=true to your system and/or IDE build/run step
 
 ## 4. Project Structure
 
@@ -86,8 +86,8 @@ Stirling-PDF/
 │                   └── SPDF/
 ├── build.gradle           # Gradle build configuration
 ├── Dockerfile             # Main Dockerfile
-├── Dockerfile.ultra-lite  # Dockerfile for ultra-lite version
+├── Dockerfile-ultra-lite  # Dockerfile for ultra-lite version
-├── Dockerfile.fat         # Dockerfile for fat version
+├── Dockerfile-fat         # Dockerfile for fat version
 ├── docker-compose.yml     # Docker Compose configuration
 └── test.sh                # Test script to deploy all docker versions and run cuke tests
 ```
@@ -102,7 +102,7 @@ Stirling-PDF offers several Docker versions:
 
 ### Example Docker Compose Files
 
-Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory, such as:
+Stirling-PDF provides several example Docker Compose files in the `exampleYmlFiles` directory such as :
 
 - `docker-compose-latest.yml`: Latest version without security features
 - `docker-compose-latest-security.yml`: Latest version with security features enabled
@@ -179,14 +179,14 @@ Stirling-PDF uses different Docker images for various configurations. The build
    For the ultra-lite version:
 
    ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
    ```
 
    For the fat version (with security enabled):
 
    ```bash
    export DOCKER_ENABLE_SECURITY=true
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .
+   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile-fat .
    ```
 
 Note: The `--no-cache` and `--pull` flags ensure that the build process uses the latest base images and doesn't use cached layers, which is useful for testing and ensuring reproducible builds. however to improve build times these can often be removed depending on your usecase
@@ -205,9 +205,9 @@ To run the test script:
 
 This script performs the following actions:
 
-1. Builds all Docker images (full, ultra-lite, fat).
+1. Builds all Docker images (full, ultra-lite, fat)
-2. Runs each version to ensure it starts correctly.
+2. Runs each version to ensure it starts correctly
-3. Executes Cucumber tests against the main version and ensures feature compatibility. In the event these tests fail, your PR will not be merged.
+3. Executes Cucumber tests against main version and ensures feature compatibility, in the event these tests fail your PR will not be merged
 
 Note: The `test.sh` script will run automatically when you raise a PR. However, it's recommended to run it locally first to save resources and catch any issues early.
 
@@ -229,7 +229,7 @@ For quick iterations and development of Java backend, JavaScript, and UI compone
 
 To run Stirling-PDF locally:
 
-1. Compile and run the project using built-in IDE methods or by running:
+1. Compile and run the project using built in IDE methods or by running:
 
    ```bash
    ./gradlew bootRun
@@ -261,7 +261,7 @@ Important notes:
 
 6. Push your changes to your fork.
 7. Submit a pull request to the main repository.
-8. See additional [contributing guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md).
+8. See additional [contributing guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
 
 When you raise a PR:
 
@@ -317,7 +317,7 @@ Remember to test your changes thoroughly to ensure they don't break any existing
 
 ### Overview of Thymeleaf
 
-Thymeleaf is a server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot.
+Thymeleaf is a  server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot
 
 ### Thymeleaf overview
 
@@ -327,24 +327,22 @@ Some examples of this are:
 
 ```html
 <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-```
 or
-```html
 <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
 ```
 
-Where it uses the `th:block`, `th:` indicating it's a special Thymeleaf element to be used server-side in generating the HTML, and block being the actual element type.
+Where it uses the th:block, th: indicating its a special thymeleaf element to be used serverside in generating the html, and block being the actual element type.
-In this case, we are inserting the `navbar` entry within the `fragments/navbar.html` fragment into the `th:block` element.
+In this case we are inserting the ``navbar`` entry within the ``fragments/navbar.html`` fragment into the ``th:block`` element.
 
-They can be more complex, such as:
+They can be more complex such as:
 
 ```html
 <th:block th:insert="~{fragments/common :: head(title=#{pageExtracter.title}, header=#{pageExtracter.header})}"></th:block>
 ```
 
-Which is the same as above but passes the parameters title and header into the fragment `common.html` to be used in its HTML generation.
+Which is the same as above but passes the parameters title and header into the fragment common.html to be used in its HTML generation
 
-Thymeleaf can also be used to loop through objects or pass things from the Java side into the HTML side.
+Thymeleaf can also be used to loop through objects or pass things from java side into html side.
 
 ```java
  @GetMapping
@@ -354,7 +352,7 @@ Thymeleaf can also be used to loop through objects or pass things from the Java
        }
 ```
 
-In the above example, if exampleData is a list of plain java objects of class Person and within it, you had id, name, age, etc. You can reference it like so
+in above example if exampleData is a list of  plain java objects of class Person and within it you had id, name, age etc. You can reference it like so
 
 ```html
 <tbody>
@@ -454,7 +452,7 @@ This would generate n entries of tr for each person in exampleData
 1. **Create a New Thymeleaf Template:**
    - Create a new HTML file in the `src/main/resources/templates` directory.
    - Use Thymeleaf attributes to dynamically generate content.
-   - Use `extract-page.html` as a base example for the HTML template, which is useful to ensure importing of the general layout, navbar, and footer.
+   - Use `extract-page.html` as a base example for the HTML template, useful to ensure importing of the general layout, navbar and footer.
 
    ```html
    <!DOCTYPE html>

Dockerfile

@@ -10,18 +10,6 @@ COPY build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
-LABEL org.opencontainers.image.title="Stirling-PDF"
-LABEL org.opencontainers.image.description="A powerful locally hosted web-based PDF manipulation tool supporting 50+ operations including merging, splitting, conversion, OCR, watermarking, and more."
-LABEL org.opencontainers.image.source="https://github.com/Stirling-Tools/Stirling-PDF"
-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.vendor="Stirling-Tools"
-LABEL org.opencontainers.image.url="https://www.stirlingpdf.com"
-LABEL org.opencontainers.image.documentation="https://docs.stirlingpdf.com"
-LABEL maintainer="Stirling-Tools"
-LABEL org.opencontainers.image.authors="Stirling-Tools"
-LABEL org.opencontainers.image.version="${VERSION_TAG}"
-LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, convert, OCR, watermark"
-
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
@@ -31,7 +19,6 @@ ENV DOCKER_ENABLE_SECURITY=false \
     PGID=1000 \
     UMASK=022
 
-
 # JDK for app
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
@@ -70,7 +57,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    tesseract --list-langs
 
 EXPOSE 8080/tcp
 

Dockerfile-fat

@@ -1,5 +1,5 @@
 # Build the application
-FROM gradle:8.12-jdk17 AS build
+FROM gradle:8.11-jdk17 AS build
 
 # Set the working directory
 WORKDIR /app
@@ -73,7 +73,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
 # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    tesseract --list-langs
 
 EXPOSE 8080/tcp
 

Dockerfile-ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45
+FROM alpine:3.21.0
 
 ARG VERSION_TAG
 

Endpoint-groups.md

@@ -0,0 +1,46 @@
+| Operation           | PageOps | Convert | Security | Other | CLI | Python | OpenCV | LibreOffice | qpdf | Java | Javascript | Unoconv | tesseract |
+| ------------------- | ------- | ------- | -------- | ----- | --- | ------ | ------ | ----------- | -------- | ---- | ---------- | ------- | ----------- |
+| adjust-contrast     | ✔️       |         |          |       |     |        |        |             |          |      | ✔️          |         |             |
+| auto-split-pdf      | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| crop                | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| extract-page        | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| merge-pdfs          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| multi-page-layout   | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| pdf-organizer       | ✔️       |         |          |       |     |        |        |             |          | ✔️    | ✔️          |         |             |
+| pdf-to-single-page  | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| remove-pages        | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| rotate-pdf          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| scale-pages         | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| split-pdfs          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| file-to-pdf         |         | ✔️       |          |       | ✔️   | ✔️      |        | ✔️           |          |      |            | ✔️       |             |
+| img-to-pdf          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| pdf-to-html         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |         |             |
+| pdf-to-img          |         | ✔️       |          |       |     | ✔️      |        |             |          | ✔️    |            |         |             |
+| pdf-to-pdfa         |         | ✔️       |          |       | ✔️   |        |        |             | ✔️        |      |            |         |            |
+| pdf-to-markdown     |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |         |             |
+| pdf-to-presentation |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |         |             |
+| pdf-to-text         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |         |             |
+| pdf-to-word         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |         |             |
+| pdf-to-xml          |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |         |             |
+| add-password        |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| add-watermark       |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| cert-sign           |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| remove-cert-sign    |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| change-permissions  |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| remove-password     |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| sanitize-pdf        |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |         |             |
+| add-image           |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| add-page-numbers    |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| auto-rename         |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| change-metadata     |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| compare             |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |         |             |
+| compress-pdf        |         |         |          | ✔️     | ✔️   |        |        |             | ✔️        |      |            |         |            |
+| extract-image-scans |         |         |          | ✔️     | ✔️   | ✔️      | ✔️      |             |          |      |            |         |             |
+| extract-images      |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| flatten             |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |         |             |
+| get-info-on-pdf     |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |         |             |
+| ocr-pdf             |         |         |          | ✔️     | ✔️   |        |        |             |         |      |            |         |    ✔        |
+| remove-blanks       |         |         |          | ✔️     | ✔️   | ✔️      | ✔️      |             |          |      |            |         |             |
+| repair              |         |         |          | ✔️     | ✔️   |        |        | ✔️           |   ✔       |      |            |         |            |
+| show-javascript     |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |         |             |
+| sign                |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |         |             |

FolderScanning.md

@@ -0,0 +1,41 @@
+## User Guide for Local Directory Scanning and File Processing
+
+### Setting Up Watched Folders
+
+- Create a folder where you want your files to be monitored. This is your 'watched folder'.
+- The default directory for this is `./pipeline/watchedFolders/`.
+- Place any directories you want to be scanned into this folder. This folder should contain multiple folders, each for their own tasks and pipelines.
+
+### Configuring Processing with JSON Files
+
+- In each directory you want processed (e.g., `./pipeline/watchedFolders/officePrinter`), include a JSON configuration file.
+- This JSON file should specify how you want the files in the directory to be handled (e.g., what operations to perform on them). This can be made, configured, and downloaded from the Stirling-PDF Pipeline interface.
+
+### Automatic Scanning and Processing
+
+- The system automatically checks the watched folder every minute for new directories and files to process.
+- When a directory with a valid JSON configuration file is found, it begins processing the files inside according to the configuration.
+
+### Processing Steps
+
+- Files in each directory are processed according to the instructions in the JSON file.
+- This might involve file conversions, data filtering, renaming files, etc. If the output of a step is a zip, this zip will be automatically unzipped as it passes to the next process.
+
+### Results and Output
+
+- After processing, the results are saved in a specified output location. This could be a different folder or location as defined in the JSON file or the default location `./pipeline/finishedFolders/`.
+- Each processed file is named and organized according to the rules set in the JSON configuration.
+
+### Completion and Cleanup
+
+- Once processing is complete, the original files in the watched folder's directory are removed.
+- You can find the processed files in the designated output location.
+
+### Error Handling
+
+- If there's an error during processing, the system will not delete the original files, allowing you to check and retry if necessary.
+
+### User Interaction
+
+- As a user, your main tasks are to set up the watched folders, place directories with files for processing, and create the corresponding JSON configuration files.
+- The system handles the rest, including scanning, processing, and outputting results.

HowToUseOCR.md

@@ -92,9 +92,8 @@ Verify installation:
 ``tesseract --list-langs``
 
 You must then edit your ``/configs/settings.yml`` and change the system.tessdataDir to match the directory containing lang files
-
 ```
 system:
  tessdataDir: C:/Program Files/Tesseract-OCR/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
 ```
-  
+  

LocalRunGuide.md

@@ -0,0 +1,327 @@
+To run the application without Docker/Podman, you will need to manually install all dependencies and build the necessary components.
+
+Note that some dependencies might not be available in the standard repositories of all Linux distributions, and may require additional steps to install.
+
+The following guide assumes you have a basic understanding of using a command line interface in your operating system.
+
+It should work on most Linux distributions and MacOS. For Windows, you might need to use Windows Subsystem for Linux (WSL) for certain steps. The amount of dependencies is to actually reduce overall size, i.e., installing LibreOffice subcomponents rather than the full LibreOffice package.
+
+You could theoretically use a Distrobox/Toolbox if your distribution has old or not all packages. But you might just as well use the Docker container then.
+
+### Step 1: Prerequisites
+
+Install the following software, if not already installed:
+
+- Java 17 or later (21 recommended)
+- Gradle 7.0 or later (included within repo so not needed on server)
+- Git
+- Python 3.8 (with pip)
+- Make
+- GCC/G++
+- Automake
+- Autoconf
+- libtool
+- pkg-config
+- zlib1g-dev
+- libleptonica-dev
+
+For Debian-based systems, you can use the following command:
+
+```bash
+sudo apt-get update
+sudo apt-get install -y git automake autoconf libtool libleptonica-dev pkg-config zlib1g-dev make g++ openjdk-21-jdk python3 python3-pip
+```
+
+For Fedora-based systems use this command:
+
+```bash
+sudo dnf install -y git automake autoconf libtool leptonica-devel pkg-config zlib-devel make gcc-c++ java-21-openjdk python3 python3-pip
+```
+
+For non-root users with Nix Package Manager, use the following command:
+
+```bash
+nix-channel --update
+nix-env -iA nixpkgs.jdk21 nixpkgs.git nixpkgs.python38 nixpkgs.gnumake nixpkgs.libgcc nixpkgs.automake nixpkgs.autoconf nixpkgs.libtool nixpkgs.pkg-config nixpkgs.zlib nixpkgs.leptonica
+```
+
+### Step 2: Clone and Build jbig2enc (Only required for certain OCR functionality)
+
+For Debian and Fedora, you can build it from source using the following commands:
+
+```bash
+mkdir ~/.git
+cd ~/.git && \
+git clone https://github.com/agl/jbig2enc.git && \
+cd jbig2enc && \
+./autogen.sh && \
+./configure && \
+make && \
+sudo make install
+```
+
+For Nix, you will face `Leptonica not detected`. Bypass this by installing it directly using the following command:
+
+```bash
+nix-env -iA nixpkgs.jbig2enc
+```
+
+### Step 3: Install Additional Software
+
+Next we need to install LibreOffice for conversions, qpdf for OCR, and OpenCV for pattern recognition functionality.
+
+Install the following software:
+
+- libreoffice-core
+- libreoffice-common
+- libreoffice-writer
+- libreoffice-calc
+- libreoffice-impress
+- python3-uno
+- unoconv
+- pngquant
+- unpaper
+- qpdf
+- opencv-python-headless
+
+For Debian-based systems, you can use the following command:
+
+```bash
+sudo apt-get install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper qpdf
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint --break-system-packages
+```
+
+For Fedora:
+
+```bash
+sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper qpdf
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
+```
+
+For Nix:
+
+```bash
+nix-env -iA nixpkgs.unpaper nixpkgs.libreoffice nixpkgs.qpdf nixpkgs.poppler_utils
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint
+```
+
+### Step 4: Clone and Build Stirling-PDF
+
+```bash
+cd ~/.git && \
+git clone https://github.com/Stirling-Tools/Stirling-PDF.git && \
+cd Stirling-PDF && \
+chmod +x ./gradlew && \
+./gradlew build
+```
+
+### Step 5: Move Jar to Desired Location
+
+After the build process, a `.jar` file will be generated in the `build/libs` directory. You can move this file to a desired location, for example, `/opt/Stirling-PDF/`. You must also move the Script folder within the Stirling-PDF repo that you have downloaded to this directory. This folder is required for the Python scripts using OpenCV.
+
+```bash
+sudo mkdir /opt/Stirling-PDF && \
+sudo mv ./build/libs/Stirling-PDF-*.jar /opt/Stirling-PDF/ && \
+sudo mv scripts /opt/Stirling-PDF/ && \
+echo "Scripts installed."
+```
+
+For non-root users, you can just keep the jar in the main directory of Stirling-PDF using the following command:
+
+```bash
+mv ./build/libs/Stirling-PDF-*.jar ./Stirling-PDF-*.jar
+```
+
+### Step 6: Other Files
+
+#### OCR
+
+If you plan to use the OCR (Optical Character Recognition) functionality, you might need to install language packs for Tesseract if running non-English scanning.
+
+##### Installing Language Packs
+
+The easiest method is to use the language packs provided by your repositories. Skip the other steps if they are available.
+
+**Manual:**
+
+1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tessdata`
+
+**IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
+
+**Debian-based systems**, install languages with this command:
+
+```bash
+sudo apt update && \
+# All languages
+# sudo apt install -y 'tesseract-ocr-*'
+
+# Find languages:
+apt search tesseract-ocr-
+
+# View installed languages:
+dpkg-query -W tesseract-ocr- | sed 's/tesseract-ocr-//g'
+```
+
+**Fedora:**
+
+```bash
+# All languages
+# sudo dnf install -y tesseract-langpack-*
+
+# Find languages:
+dnf search -C tesseract-langpack-
+
+# View installed languages:
+rpm -qa | grep tesseract-langpack | sed 's/tesseract-langpack-//g'
+```
+
+**Nix:**
+
+```bash
+nix-env -iA nixpkgs.tesseract
+```
+
+**Note:** Nix Package Manager pre-installs almost all the language packs when Tesseract is installed.
+
+### Step 7: Run Stirling-PDF
+
+Those who have pushed to the root directory, run the following commands:
+
+```bash
+./gradlew bootRun
+or
+java -jar /opt/Stirling-PDF/Stirling-PDF-*.jar
+```
+
+Since LibreOffice, soffice, and conversion tools have their dbus_tmp_dir set as `dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"`, you might get the following error when using their endpoints:
+
+```
+[Thread-7] INFO  s.s.SPDF.utils.ProcessExecutor - mkdir: cannot create directory ‘/run/user/1501’: Permission denied
+```
+
+To resolve this, before starting Stirling-PDF, you have to set the environment variable to a directory you have write access to by using the following commands:
+
+```bash
+mkdir temp
+export DBUS_SESSION_BUS_ADDRESS="unix:path=./temp"
+./gradlew bootRun
+or
+java -jar ./Stirling-PDF-*.jar
+```
+
+### Step 8: Adding a Desktop Icon
+
+This will add a modified app starter to your app menu.
+
+```bash
+location=$(pwd)/gradlew
+image=$(pwd)/docs/stirling-transparent.svg
+
+cat > ~/.local/share/applications/Stirling-PDF.desktop <<EOF
+[Desktop Entry]
+Name=Stirling PDF;
+GenericName=Launch StirlingPDF and open its WebGUI;
+Category=Office;
+Exec=xdg-open http://localhost:8080 && nohup $location bootRun &;
+Icon=$image;
+Keywords=pdf;
+Type=Application;
+NoDisplay=false;
+Terminal=true;
+EOF
+```
+
+Note: Currently the app will run in the background until manually closed.
+
+### Optional: Changing the Host and Port of the Application
+
+To override the default configuration, you can add the following to `/.git/Stirling-PDF/configs/custom_settings.yml` file:
+
+```yaml
+server:
+  host: 0.0.0.0 # Not working - use instead address
+  address: 0.0.0.0
+  port: 3000
+```
+
+`-Djava.net.preferIPv4Stack=true` --> To force IPv4 only in the Java starting command
+
+**Note:** This file is created after the first application launch. To have it before that, you can create the directory and add the file yourself.
+
+### Optional: Run Stirling-PDF as a Service (requires root)
+
+First create a `.env` file, where you can store environment variables:
+
+```bash
+touch /opt/Stirling-PDF/.env
+```
+
+In this file, you can add all variables, one variable per line, as stated in the main readme (for example `SYSTEM_DEFAULTLOCALE="de-DE"`).
+
+Create a new file where we store our service settings and open it with the nano editor:
+
+```bash
+nano /etc/systemd/system/stirlingpdf.service
+```
+
+Paste this content, make sure to update the filename of the jar file. Press `Ctrl+S` and `Ctrl+X` to save and exit the nano editor:
+
+```ini
+[Unit]
+Description=Stirling-PDF service
+After=syslog.target network.target
+
+[Service]
+SuccessExitStatus=143
+
+User=root
+Group=root
+
+Type=simple
+
+EnvironmentFile=/opt/Stirling-PDF/.env
+WorkingDirectory=/opt/Stirling-PDF
+ExecStart=/usr/bin/java -jar Stirling-PDF-0.17.2.jar
+ExecStop=/bin/kill -15 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Notify systemd that it has to rebuild its internal service database (you have to run this command every time you make a change in the service file):
+
+```bash
+sudo systemctl daemon-reload
+```
+
+Enable the service to tell it to start automatically:
+
+```bash
+sudo systemctl enable stirlingpdf.service
+```
+
+See the status of the service:
+
+```bash
+sudo systemctl status stirlingpdf.service
+```
+
+Manually start/stop/restart the service:
+
+```bash
+sudo systemctl start stirlingpdf.service
+sudo systemctl stop stirlingpdf.service
+sudo systemctl restart stirlingpdf.service
+```
+
+---
+
+Remember to set the necessary environment variables before running the project if you want to customize the application. The list can be seen in the main readme.
+
+You can do this in the terminal by using the `export` command or `-D` argument to the Java `-jar` command:
+
+```bash
+export APP_HOME_NAME="Stirling PDF"
+or
+-DAPP_HOME_NAME="Stirling PDF"

PipelineFeature.md

@@ -0,0 +1,42 @@
+# Pipeline Configuration and Usage Tutorial
+
+- Configure the pipeline config file and input files to run files against it.
+- For reuse, download the config file and re-upload it when needed, or place it in `/pipeline/defaultWebUIConfigs/` to auto-load in the web UI for all users.
+
+## Steps to Configure and Use Your Pipeline
+
+1. **Access Configuration**
+   - Upon entering the screen, click on the **Configure** button.
+
+2. **Enter Pipeline Name**
+   - Provide a name for your pipeline in the designated field.
+
+3. **Select Operations**
+   - Choose the operations for your pipeline (e.g., **Split Pages**), then click **Add Operation**.
+
+4. **Configure Operation Settings**
+   - Input the necessary settings for each added operation. Settings are highlighted in yellow if customization is needed.
+
+5. **Add More Operations**
+   - You can add and adjust the order of multiple operations. Ensure each operation's settings are customized.
+
+6. **Save Settings**
+   - Click **Save Operation Settings** after customizing settings for each operation.
+
+7. **Validate Pipeline**
+   - Use the **Validation** button to check your pipeline. A green indicator signifies correct setup; a pop-out error indicates issues.
+
+8. **Download Pipeline Configuration**
+   - To use the configuration for folder scanning (or save it for future use and re-upload it), download a JSON file in this menu. You can also pre-load it for future use by placing it in `/pipeline/defaultWebUIConfigs/`. It will then appear in the dropdown menu for all users to use.
+
+9. **Submit Files for Processing**
+   - If your pipeline is correctly set up, close the configure menu, input the files, and hit **Submit**.
+
+10. **Note on Web UI Limitations**
+    - The current web UI version does not support operations that require multiple different types of inputs, such as adding a separate image to a PDF.
+
+### Current Limitations
+
+- Cannot have more than one of the same operation.
+- Cannot input additional files via UI.
+- All files and operations run in serial mode.

README.md

@@ -6,36 +6,34 @@
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
 
-
 <a href="https://www.producthunt.com/posts/stirling-pdf?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-stirling&#0045;pdf" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=641239&theme=light" alt="Stirling&#0032;PDF - Open&#0032;source&#0032;locally&#0032;hosted&#0032;web&#0032;PDF&#0032;editor | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
 
 [Stirling-PDF](https://www.stirlingpdf.com) is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements.
 
+Stirling-PDF does not initiate any outbound calls for record-keeping or tracking purposes.
+
 All files and PDFs exist either exclusively on the client side, reside in server memory only during task execution, or temporarily reside in a file solely for the execution of the task. Any file downloaded by the user will have been deleted from the server by that point.
 
-
-All information available at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/)
-
 ![stirling-home](images/stirling-home.jpg)
 
 ## Features
 
-- 50+ PDF Operations
+- Enterprise features like SSO Check [here](https://docs.stirlingpdf.com/Enterprise%20Edition)
-- Parallel file processing and downloads
 - Dark mode support
 - Custom download options
-- Custom 'Pipelines' to run multiple features in a automated queue
+- Parallel file processing and downloads
+- Custom 'Pipelines' to run multiple features in a queue
 - API for integration with external scripts
-- Optional Login and Authentication support (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/System%20and%20Security) for documentation)
+- Optional Login and Authentication support (see [here](https://github.com/Stirling-Tools/Stirling-PDF/tree/main#login-authentication) for documentation)
-- Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)
+- Database Backup and Import (see [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DATABASE.md) for documentation)
-- Enterprise features like SSO see [here](https://docs.stirlingpdf.com/Enterprise%20Edition)
+
 
 ## PDF Features
 
 ### Page Operations
 
-- View and modify PDFs - View multi-page PDFs with custom viewing, sorting, and searching. Plus, on-page edit features like annotating, drawing, and adding text and images. (Using PDF.js with Joxit and Liberation fonts)
+- View and modify PDFs - View multi-page PDFs with custom viewing, sorting, and searching. Plus on-page edit features like annotate, draw, and adding text and images. (Using PDF.js with Joxit and Liberation fonts)
 - Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages
 - Merge multiple PDFs into a single resultant file
 - Split PDFs into multiple files at specified page numbers or extract all pages as individual files
@@ -46,11 +44,11 @@ All information available at [https://docs.stirlingpdf.com/](https://docs.stirli
 - Scale page contents size by set percentage
 - Adjust contrast
 - Crop PDF
-- Auto-split PDF (with physically scanned page dividers)
+- Auto split PDF (with physically scanned page dividers)
 - Extract page(s)
 - Convert PDF to a single page
 - Overlay PDFs on top of each other
-- PDF to a single page
+- PDF to single page
 - Split PDF by sections
 
 ### Conversion Operations
@@ -59,7 +57,7 @@ All information available at [https://docs.stirlingpdf.com/](https://docs.stirli
 - Convert any common file to PDF (using LibreOffice)
 - Convert PDF to Word/PowerPoint/others (using LibreOffice)
 - Convert HTML to PDF
-- Convert PDF to XML
+- Convert PDF to xml
 - Convert PDF to CSV
 - URL to PDF
 - Markdown to PDF
@@ -87,28 +85,105 @@ All information available at [https://docs.stirlingpdf.com/](https://docs.stirli
 - Extract images from scans
 - Remove annotations
 - Add page numbers
-- Auto-rename files by detecting PDF header text
+- Auto rename file by detecting PDF header text
-- OCR on PDF (using Tesseract OCR)
+- OCR on PDF (using tesseract)
-- PDF/A conversion (using LibreOffice)
+- PDF/A conversion (using libreoffice)
 - Edit metadata
 - Flatten PDFs
 - Get all information on a PDF to view or export as JSON
 - Show/detect embedded JavaScript
 
+For an overview of the tasks and the technology each uses, please view [Endpoint-groups.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md).
 
+A demo of the app is available [here](https://stirlingpdf.io).
 
+## Technologies Used
 
-# 📖 Get Started
+- Spring Boot + Thymeleaf
+- [PDFBox](https://github.com/apache/pdfbox/tree/trunk)
+- [LibreOffice](https://www.libreoffice.org/discover/libreoffice/) for advanced conversions
+- [qpdf](https://github.com/qpdf/qpdf)
+- HTML, CSS, JavaScript
+- Docker
+- [PDF.js](https://github.com/mozilla/pdf.js)
+- [PDF-LIB.js](https://github.com/Hopding/pdf-lib)
 
-Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.stirlingpdf.com) for:
+## How to Use
 
-- Installation guides for all platforms
+### Windows
-- Configuration options
-- Feature documentation
-- API reference
-- Security setup
-- Enterprise features
 
+For Windows users, download the latest Stirling-PDF.exe from our [release](https://github.com/Stirling-Tools/Stirling-PDF/releases) section or by clicking [here](https://github.com/Stirling-Tools/Stirling-PDF/releases/latest/download/Stirling-PDF.exe).
+
+### Locally
+
+Please view the [LocalRunGuide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LocalRunGuide.md).
+
+### Docker / Podman
+
+> [!NOTE]
+> <https://hub.docker.com/r/stirlingtools/stirling-pdf>
+
+Stirling-PDF has three different versions: a full version, an ultra-lite version, and a 'fat' version. Depending on the types of features you use, you may want a smaller image to save on space. To see what the different versions offer, please look at our [version mapping](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Version-groups.md). For people that don't mind space optimization, just use the latest tag.
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest?label=Stirling-PDF%20Full)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/stirlingtools/stirling-pdf/latest-fat?label=Stirling-PDF%20Fat)
+
+Please note in the examples below, you may need to change the volume paths as needed, e.g., `./extraConfigs:/configs` to `/opt/stirlingpdf/extraConfigs:/configs`.
+
+### Docker Run
+
+```bash
+docker run -d \
+  -p 8080:8080 \
+  -v ./trainingData:/usr/share/tessdata \
+  -v ./extraConfigs:/configs \
+  -v ./logs:/logs \
+# Optional customization (not required)
+# -v /location/of/customFiles:/customFiles \
+  -e DOCKER_ENABLE_SECURITY=false \
+  -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
+  -e LANGS=en_GB \
+  --name stirling-pdf \
+  stirlingtools/stirling-pdf:latest
+```
+
+### Docker Compose
+
+```yaml
+version: '3.3'
+services:
+  stirling-pdf:
+    image: stirlingtools/stirling-pdf:latest
+    ports:
+      - '8080:8080'
+    volumes:
+      - ./trainingData:/usr/share/tessdata # Required for extra OCR languages
+      - ./extraConfigs:/configs
+#      - ./customFiles:/customFiles/
+#      - ./logs:/logs/
+    environment:
+      - DOCKER_ENABLE_SECURITY=false
+      - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
+      - LANGS=en_GB
+```
+
+Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
+
+### Kubernetes
+
+See the kubernetes helm chart [here](https://github.com/Stirling-Tools/Stirling-PDF-chart)
+
+## Enable OCR/Compression Feature
+
+Please view the [HowToUseOCR.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md).
+
+## Reuse Stored Files
+
+Certain functionality like `Sign` supports pre-saved files stored at `/customFiles/signatures/`. Image files placed within here will be accessible to be used via the web UI. Currently, this supports two folder types:
+
+- `/customFiles/signatures/ALL_USERS`: Accessible to all users, useful for organizations where many users use the same files or for users not using authentication
+- `/customFiles/signatures/{username}`: Such as `/customFiles/signatures/froodle`, accessible only to the `froodle` username, private for all others
 
 ## Supported Languages
 
@@ -116,57 +191,238 @@ Stirling-PDF currently supports 38 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![93%](https://geps.dev/progress/93)   |
+| Arabic (العربية) (ar_AR)                        | ![94%](https://geps.dev/progress/94)   |
 | Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![92%](https://geps.dev/progress/92)   |
 | Basque (Euskara) (eu_ES)                     | ![53%](https://geps.dev/progress/53)   |
 | Bulgarian (Български) (bg_BG)                | ![89%](https://geps.dev/progress/89)   |
 | Catalan (Català) (ca_CA)                     | ![84%](https://geps.dev/progress/84)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![90%](https://geps.dev/progress/90)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![91%](https://geps.dev/progress/91)   |
 | Czech (Česky) (cs_CZ)                        | ![90%](https://geps.dev/progress/90)   |
 | Danish (Dansk) (da_DK)                       | ![89%](https://geps.dev/progress/89)   |
-| Dutch (Nederlands) (nl_NL)                   | ![88%](https://geps.dev/progress/88)   |
+| Dutch (Nederlands) (nl_NL)                   | ![89%](https://geps.dev/progress/89)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![96%](https://geps.dev/progress/96)   |
+| French (Français) (fr_FR)                    | ![92%](https://geps.dev/progress/92)   |
-| German (Deutsch) (de_DE)                     | ![99%](https://geps.dev/progress/99)   |
+| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
 | Greek (Ελληνικά) (el_GR)                     | ![90%](https://geps.dev/progress/90)   |
 | Hindi (हिंदी) (hi_IN)                          | ![88%](https://geps.dev/progress/88)   |
-| Hungarian (Magyar) (hu_HU)                   | ![90%](https://geps.dev/progress/90)   |
+| Hungarian (Magyar) (hu_HU)                   | ![91%](https://geps.dev/progress/91)   |
 | Indonesian (Bahasa Indonesia) (id_ID)        | ![90%](https://geps.dev/progress/90)   |
 | Irish (Gaeilge) (ga_IE)                      | ![82%](https://geps.dev/progress/82)   |
-| Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
+| Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
 | Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
-| Korean (한국어) (ko_KR)                      | ![88%](https://geps.dev/progress/88)   |
+| Korean (한국어) (ko_KR)                      | ![89%](https://geps.dev/progress/89)   |
 | Norwegian (Norsk) (no_NB)                    | ![82%](https://geps.dev/progress/82)   |
-| Persian (فارسی) (fa_IR)                      | ![98%](https://geps.dev/progress/98)   |
+| Persian (فارسی) (fa_IR)                      | ![99%](https://geps.dev/progress/99)   |
-| Polish (Polski) (pl_PL)                      | ![89%](https://geps.dev/progress/89)   |
+| Polish (Polski) (pl_PL)                      | ![90%](https://geps.dev/progress/90)   |
 | Portuguese (Português) (pt_PT)               | ![90%](https://geps.dev/progress/90)   |
 | Portuguese Brazilian (Português) (pt_BR)     | ![98%](https://geps.dev/progress/98)   |
 | Romanian (Română) (ro_RO)                    | ![84%](https://geps.dev/progress/84)   |
 | Russian (Русский) (ru_RU)                    | ![90%](https://geps.dev/progress/90)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![66%](https://geps.dev/progress/66)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![67%](https://geps.dev/progress/67)   |
 | Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
-| Slovakian (Slovensky) (sk_SK)                | ![77%](https://geps.dev/progress/77)   |
+| Slovakian (Slovensky) (sk_SK)                | ![78%](https://geps.dev/progress/78)   |
-| Spanish (Español) (es_ES)                    | ![90%](https://geps.dev/progress/90)   |
+| Spanish (Español) (es_ES)                    | ![91%](https://geps.dev/progress/91)   |
-| Swedish (Svenska) (sv_SE)                    | ![89%](https://geps.dev/progress/89)   |
+| Swedish (Svenska) (sv_SE)                    | ![90%](https://geps.dev/progress/90)   |
-| Thai (ไทย) (th_TH)                           | ![89%](https://geps.dev/progress/89)   |
+| Thai (ไทย) (th_TH)                           | ![90%](https://geps.dev/progress/90)   |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![91%](https://geps.dev/progress/91)   |
 | Turkish (Türkçe) (tr_TR)                     | ![86%](https://geps.dev/progress/86)   |
-| Ukrainian (Українська) (uk_UA)               | ![75%](https://geps.dev/progress/75)   |
+| Ukrainian (Українська) (uk_UA)               | ![76%](https://geps.dev/progress/76)   |
 | Vietnamese (Tiếng Việt) (vi_VN)              | ![83%](https://geps.dev/progress/83)   |
 
+## Contributing (Creating Issues, Translations, Fixing Bugs, etc.)
+
+Please see our [Contributing Guide](CONTRIBUTING.md).
 
 ## Stirling PDF Enterprise
 
-Stirling PDF offers an Enterprise edition of its software. This is the same great software but with added features, support and comforts.
+Stirling PDF offers a Enterprise edition of its software, This is the same great software but with added features and comforts
-Check out our [Enterprise docs](https://docs.stirlingpdf.com/Enterprise%20Edition)
+
+### Whats included
+
+- Prioritised Support tickets via support@stirlingpdf.com to reach directly to Stirling-PDF team for support and 1:1 meetings where applicable (Provided they come from same email domain registered with us)
+- Prioritised Enhancements to Stirling-PDF where applicable
+- Base SSO support
+- Advanced SSO such as automated login handling (Coming very soon)
+- SAML SSO (Coming very soon)
+- Custom automated metadata handling
+- Advanced user configurations (Coming soon)
+- Plus other exciting features to come
+
+Check out of [docs](https://docs.stirlingpdf.com/Enterprise%20Edition) on it or our official [website](https://www.stirlingpdf.com)
+
+## Customization
+
+Stirling-PDF allows easy customization of the app, including things like:
+
+- Custom application name
+- Custom slogans, icons, HTML, images, CSS, etc. (via file overrides)
+
+There are two options for this, either using the generated settings file `settings.yml`, which is located in the `/configs` directory and follows standard YAML formatting, or using environment variables, which would override the settings file.
+
+For example, in `settings.yml`, you might have:
+
+```yaml
+security:
+  enableLogin: 'true'
+```
+
+To have this via an environment variable, you would use `SECURITY_ENABLELOGIN`.
+
+The current list of settings is:
+
+```yaml
+security:
+  enableLogin: false # set to 'true' to enable login
+  csrfDisabled: true # set to 'true' to disable CSRF protection (not recommended for production)
+  loginAttemptCount: 5 # lock user account after 5 tries; when using e.g. Fail2Ban you can deactivate the function with -1
+  loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
+  loginMethod: all # 'all' (Login Username/Password and OAuth2[must be enabled and configured]), 'normal'(only Login with Username/Password) or 'oauth2'(only Login with OAuth2)
+  initialLogin:
+    username: '' # initial username for the first login
+    password: '' # initial password for the first login
+  oauth2:
+    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
+    client:
+      keycloak:
+        issuer: '' # URL of the Keycloak realm's OpenID Connect Discovery endpoint
+        clientId: '' # client ID for Keycloak OAuth2
+        clientSecret: '' # client secret for Keycloak OAuth2
+        scopes: openid, profile, email # scopes for Keycloak OAuth2
+        useAsUsername: preferred_username # field to use as the username for Keycloak OAuth2
+      google:
+        clientId: '' # client ID for Google OAuth2
+        clientSecret: '' # client secret for Google OAuth2
+        scopes: https://www.googleapis.com/auth/userinfo.email, https://www.googleapis.com/auth/userinfo.profile # scopes for Google OAuth2
+        useAsUsername: email # field to use as the username for Google OAuth2
+      github:
+        clientId: '' # client ID for GitHub OAuth2
+        clientSecret: '' # client secret for GitHub OAuth2
+        scopes: read:user # scope for GitHub OAuth2
+        useAsUsername: login # field to use as the username for GitHub OAuth2
+    issuer: '' # set to any provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) endpoint
+    clientId: '' # client ID from your provider
+    clientSecret: '' # client secret from your provider
+    autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
+    blockRegistration: false # set to 'true' to deny login with SSO without prior registration by an admin
+    useAsUsername: email # default is 'email'; custom fields can be used as the username
+    scopes: openid, profile, email # specify the scopes for which the application will request permissions
+    provider: google # set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
+  saml2:
+    enabled: false # currently in alpha, not recommended for use yet, enableAlphaFunctionality must be set to true
+    autoCreateUser: false # set to 'true' to allow auto-creation of non-existing users
+    blockRegistration: false # set to 'true' to deny login with SSO without prior registration by an admin
+    registrationId: stirling
+    idpMetadataUri: https://dev-XXXXXXXX.okta.com/app/externalKey/sso/saml/metadata
+    idpSingleLogoutUrl: https://dev-XXXXXXXX.okta.com/app/dev-XXXXXXXX_stirlingpdf_1/externalKey/slo/saml
+    idpSingleLoginUrl: https://dev-XXXXXXXX.okta.com/app/dev-XXXXXXXX_stirlingpdf_1/externalKey/sso/saml
+    idpIssuer: http://www.okta.com/externalKey
+    idpCert: classpath:okta.crt
+    privateKey: classpath:saml-private-key.key
+    spCert: classpath:saml-public-cert.crt
+
+enterpriseEdition:
+  enabled: false # set to 'true' to enable enterprise edition
+  key: 00000000-0000-0000-0000-000000000000
+  CustomMetadata:
+    autoUpdateMetadata: false # set to 'true' to automatically update metadata with below values
+    author: username # supports text such as 'John Doe' or types such as username to autopopulate with user's username
+    creator: Stirling-PDF # supports text such as 'Company-PDF'
+    producer: Stirling-PDF # supports text such as 'Company-PDF'
+
+legal:
+  termsAndConditions: https://www.stirlingpdf.com/terms-and-conditions # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
+  privacyPolicy: https://www.stirlingpdf.com/privacy-policy # URL to the privacy policy of your application (e.g. https://example.com/privacy). Empty string to disable or filename to load from local file in static folder
+  accessibilityStatement: '' # URL to the accessibility statement of your application (e.g. https://example.com/accessibility). Empty string to disable or filename to load from local file in static folder
+  cookiePolicy: '' # URL to the cookie policy of your application (e.g. https://example.com/cookie). Empty string to disable or filename to load from local file in static folder
+  impressum: '' # URL to the impressum of your application (e.g. https://example.com/impressum). Empty string to disable or filename to load from local file in static folder
+
+system:
+  defaultLocale: en-US # set the default language (e.g. 'de-DE', 'fr-FR', etc)
+  googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow
+  enableAlphaFunctionality: false # set to enable functionality which might need more testing before it fully goes live (this feature might make no changes)
+  showUpdate: false # see when a new update is available
+  showUpdateOnlyAdmin: false # only admins can see when a new update is available, depending on showUpdate it must be set to 'true'
+  customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template HTML files
+  tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
+  enableAnalytics: undefined # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
+
+ui:
+  appName: '' # application's visible name
+  homeDescription: '' # short description or tagline shown on the homepage
+  appNameNavbar: '' # name displayed on the navigation bar
+
+endpoints:
+  toRemove: [] # list endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
+  groupsToRemove: [] # list groups to disable (e.g. ['LibreOffice'])
+
+metrics:
+  enabled: true # 'true' to enable Info APIs (`/api/*`) endpoints, 'false' to disable
+
+# Automatically Generated Settings (Do Not Edit Directly)
+AutomaticallyGenerated:
+  key: example
+  UUID: example
+```
+
+There is an additional config file `/configs/custom_settings.yml` where users familiar with Java and Spring `application.properties` can input their own settings on top of Stirling-PDF's existing ones.
 
 
-## 🤝 Looking to contribute?
 
-Join our community:
+### Extra Notes
-- [Contribution Guidelines](CONTRIBUTING.md)
+
-- [Translation Guide (How to add custom languages)](HowToAddNewLanguage.md)
+- **Endpoints**: Currently, the `ENDPOINTS_TO_REMOVE` and `GROUPS_TO_REMOVE` endpoints can include comma-separated lists of endpoints and groups to disable. For example, `ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages` would disable both image-to-pdf and remove pages, while `GROUPS_TO_REMOVE=LibreOffice` would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md).
-- [Issue Tracker](https://github.com/Stirling-Tools/Stirling-PDF/issues)
+- **customStaticFilePath**: Customize static files such as the app logo by placing files in the `/customFiles/static/` directory. An example of customizing the app logo is placing `/customFiles/static/favicon.svg` to override the current SVG. This can be used to change any `images/icons/css/fonts/js`, etc. in Stirling-PDF.
-- [Discord Community](https://discord.gg/HYmhKj45pU)
+
-- [Developer Guide](DeveloperGuide.md)
+### Environment-Only Parameters
+
+- `SYSTEM_ROOTURIPATH` - Set the application's root URI (e.g. `/pdf-app` to set the root URI to `localhost:8080/pdf-app`)
+- `SYSTEM_CONNECTIONTIMEOUTMINUTES` - Set custom connection timeout values
+- `DOCKER_ENABLE_SECURITY` - Set to `true` to download security jar (required for authentication login)
+- `INSTALL_BOOK_AND_ADVANCED_HTML_OPS` - Download Calibre onto Stirling-PDF to enable PDF to/from book and advanced HTML conversion
+- `LANGS` - Define custom font libraries to install for document conversions
+
+## API
+
+For those wanting to use Stirling-PDF's backend API to link with their own custom scripting to edit PDFs, you can view all existing API documentation [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/), or navigate to `/swagger-ui/index.html` of your Stirling-PDF instance for your version's documentation (or by following the API button in the settings of Stirling-PDF).
+
+## Login Authentication
+
+![stirling-login](images/login-light.png)
+
+### Prerequisites
+
+- User must have the folder `./configs` volumed within Docker so that it is retained during updates.
+- Docker users must download the security jar version by setting `DOCKER_ENABLE_SECURITY` to `true` in environment variables.
+- Then either enable login via the `settings.yml` file or set `SECURITY_ENABLE_LOGIN` to `true`.
+- Now the initial user will be generated with username `admin` and password `stirling`. On login, you will be forced to change the password to a new one. You can also use the environment variables `SECURITY_INITIALLOGIN_USERNAME` and `SECURITY_INITIALLOGIN_PASSWORD` to set your own credentials straight away (recommended to remove them after user creation).
+
+Once the above has been done, on restart, a new `stirling-pdf-DB.mv.db` will show if everything worked.
+
+When you log in to Stirling-PDF, you will be redirected to the `/login` page to log in with those default credentials. After login, everything should function as normal.
+
+To access your account settings, go to Account Settings in the settings cog menu (top right in the navbar). This Account Settings menu is also where you find your API key.
+
+To add new users, go to the bottom of Account Settings and hit 'Admin Settings'. Here you can add new users. The different roles mentioned within this are for rate limiting. This is a work in progress and will be expanded on more in the future.
+
+For API usage, you must provide a header with `X-API-KEY` and the associated API key for that user.
+
+## FAQ
+
+### Q1: What are your planned features?
+
+- Progress bar/tracking
+- Full custom logic pipelines to combine multiple operations together
+- Folder support with auto-scanning to perform operations on
+- Redact text (via UI, not just automated)
+- Add forms
+- Multi-page layout (stitch PDF pages together) support x rows y columns and custom page sizing
+- Fill forms manually or automatically
+
+### Q2: Why is my application downloading .htm files? Why am i getting HTTP error 413?
+
+This is an issue commonly caused by your NGINX configuration. The default file upload size for NGINX is 1MB. You need to add the following in your Nginx sites-available file: `client_max_body_size SIZE;` (where "SIZE" is 50M for example for 50MB files).
+
+### Q3: Why is my download timing out?
+
+NGINX has timeout values by default, so if you are running Stirling-PDF behind NGINX, you may need to set a timeout value, such as adding the config `proxy_read_timeout 3600;`.

SECURITY.md

@@ -1,63 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-The Stirling-PDF team takes security vulnerabilities seriously. We appreciate your efforts to responsibly disclose your findings.
-
-### How to Report
-
-You can report security vulnerabilities through two channels:
-
-1. **GitHub Security Advisory**:
-   - Navigate to the [Security tab](https://github.com/Stirling-Tools/Stirling-PDF/security) in our repository
-   - Click on "Report a vulnerability"
-   - Provide a detailed description of the vulnerability
-
-2. **Direct Email**:
-   - Send your report to security@stirlingpdf.com
-   - Please include as much information as possible about the vulnerability
-
-### What to Include
-
-When reporting a vulnerability, please provide:
-
-- A clear description of the vulnerability
-- Steps to reproduce the issue
-- Any potential impact
-- If possible, suggestions for addressing the vulnerability
-- Your contact information for follow-up questions
-
-### Response Time
-
-We aim to acknowledge receipt of your vulnerability report within 48 hours
-
-### Process
-
-1. Submit your report through one of the channels above
-2. Receive an acknowledgment from our team
-3. Our team will investigate and validate the issue
-4. We will work on a fix and keep you updated on our progress
-5. Once resolved, we will publish the fix and acknowledge your contribution (if desired)
-
-### Bug Bounty
-
-At this time, we do not offer a bug bounty program. However, we greatly appreciate your efforts in making Stirling-PDF more secure and will acknowledge your contribution in our release notes (unless you prefer to remain anonymous).
-
-## Supported Versions
-
-Only the latest version of Stirling-PDF is supported for security updates. We do not backport security fixes to older versions.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| Latest  | :white_check_mark: |
-| Older   | :x:               |
-
-**Please note:** Before reporting a security issue, ensure you are using the latest version of Stirling-PDF. Security reports for older versions will not be accepted.
-
-## Security Best Practices
-
-When deploying Stirling-PDF:
-
-1. Always use the latest version
-2. Follow our deployment guidelines
-3. Regularly check for and apply updates

Version-groups.md

@@ -0,0 +1,68 @@
+|All versions in a Docker environment can download Calibre as a optional extra at runtime to support `book-to-pdf` and `pdf-to-book` using parameter ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS``.
+The 'Fat' container contains all those found in 'Full' with security jar along with this Calibre install.
+
+| Technology | Ultra-Lite | Full  |
+| ---------- | :--------: | :---: |
+| Java       |     ✔️      |   ✔️   |
+| JavaScript |     ✔️      |   ✔️   |
+| Libre      |            |   ✔️   |
+| Python     |            |   ✔️   |
+| OpenCV     |            |   ✔️   |
+| qpdf   |            |   ✔️   |
+
+| Operation              | Ultra-Lite | Full |
+| ---------------------- | ---------- | ---- |
+| add-page-numbers       | ✔️          | ✔️    |
+| add-password           | ✔️          | ✔️    |
+| add-image              | ✔️          | ✔️    |
+| add-watermark          | ✔️          | ✔️    |
+| adjust-contrast        | ✔️          | ✔️    |
+| auto-split-pdf         | ✔️          | ✔️    |
+| auto-redact            | ✔️          | ✔️    |
+| auto-rename            | ✔️          | ✔️    |
+| cert-sign              | ✔️          | ✔️    |
+| remove-cert-sign       | ✔️          | ✔️    |
+| crop                   | ✔️          | ✔️    |
+| change-metadata        | ✔️          | ✔️    |
+| change-permissions     | ✔️          | ✔️    |
+| compare                | ✔️          | ✔️    |
+| extract-page           | ✔️          | ✔️    |
+| extract-images         | ✔️          | ✔️    |
+| flatten                | ✔️          | ✔️    |
+| get-info-on-pdf        | ✔️          | ✔️    |
+| img-to-pdf             | ✔️          | ✔️    |
+| markdown-to-pdf        | ✔️          | ✔️    |
+| merge-pdfs             | ✔️          | ✔️    |
+| multi-page-layout      | ✔️          | ✔️    |
+| overlay-pdf            | ✔️          | ✔️    |
+| pdf-organizer          | ✔️          | ✔️    |
+| pdf-to-csv             | ✔️          | ✔️    |
+| pdf-to-img             | ✔️          | ✔️    |
+| pdf-to-single-page     | ✔️          | ✔️    |
+| remove-pages           | ✔️          | ✔️    |
+| remove-password        | ✔️          | ✔️    |
+| rotate-pdf             | ✔️          | ✔️    |
+| sanitize-pdf           | ✔️          | ✔️    |
+| scale-pages            | ✔️          | ✔️    |
+| sign                   | ✔️          | ✔️    |
+| show-javascript        | ✔️          | ✔️    |
+| split-by-size-or-count | ✔️          | ✔️    |
+| split-pdf-by-sections  | ✔️          | ✔️    |
+| split-pdfs             | ✔️          | ✔️    |
+| compress-pdf           |            | ✔️    |
+| extract-image-scans    |            | ✔️    |
+| ocr-pdf                |            | ✔️    |
+| pdf-to-pdfa            |            | ✔️    |
+| remove-blanks          |            | ✔️    |
+pdf-to-text             |     ✔️      |  ✔️
+pdf-to-html             |            |  ✔️
+pdf-to-word             |            |  ✔️
+pdf-to-presentation     |            |  ✔️
+pdf-to-xml              |            |  ✔️
+remove-annotations      |     ✔️      |  ✔️
+remove-cert-sign        |     ✔️      |  ✔️
+remove-image-pdf        |     ✔️      |  ✔️
+file-to-pdf             |            |  ✔️
+html-to-pdf             |            |  ✔️
+url-to-pdf              |            |  ✔️
+repair                  |            |  ✔️

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.4.1"
+    id "org.springframework.boot" version "3.4.0"
-    id "io.spring.dependency-management" version "1.1.7"
+    id "io.spring.dependency-management" version "1.1.6"
     id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
     id "io.swagger.swaggerhub" version "1.3.2"
     id "edu.sc.seis.launch4j" version "3.0.6"
@@ -16,7 +16,7 @@ plugins {
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.4.1"
+    springBootVersion = "3.4.0"
     pdfboxVersion = "3.0.3"
     logbackVersion = "1.5.7"
     imageioVersion = "3.12.0"
@@ -27,7 +27,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.36.6"
+version = "0.36.5"
 
 
 java {

cucumber/features/general.feature

@@ -1,7 +1,7 @@
 @general
 Feature: API Validation
 
-
+	
   @split-pdf-by-sections @positive
   Scenario Outline: split-pdf-by-sections with different parameters
     Given I generate a PDF file as "fileInput"
@@ -66,7 +66,7 @@ Feature: API Validation
     | pageNumbers | file_count |
     | 1,3,5-9     | 8          |
     | all         | 20         |
-    | 2n+1        | 10         |
+    | 2n+1        | 11         |
     | 3n          | 7          |
 
 
@@ -106,9 +106,9 @@ Feature: API Validation
 	And the response ZIP should contain 2 files
     And the response file should have size greater than 0
 	And the response status code should be 200
-
+	
 	Examples:
-    | format |
+    | format | 
-    | png        |
+    | png        | 
     | gif         |
-    | jpeg        |
+    | jpeg        | 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -22,31 +22,22 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 import stirling.software.SPDF.model.User;
 
-@Slf4j
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    private final ApplicationProperties applicationProperties;
     private final UserService userService;
     private final SessionPersistentRegistry sessionPersistentRegistry;
     private final boolean loginEnabledValue;
 
     public UserAuthenticationFilter(
-            @Lazy ApplicationProperties applicationProperties,
             @Lazy UserService userService,
             SessionPersistentRegistry sessionPersistentRegistry,
             @Qualifier("loginEnabled") boolean loginEnabledValue) {
-        this.applicationProperties = applicationProperties;
         this.userService = userService;
         this.sessionPersistentRegistry = sessionPersistentRegistry;
         this.loginEnabledValue = loginEnabledValue;
@@ -130,67 +121,33 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         // Check if the authenticated user is disabled and invalidate their session if so
         if (authentication != null && authentication.isAuthenticated()) {
-
-            Security securityProp = applicationProperties.getSecurity();
-            LoginMethod loginMethod = LoginMethod.UNKNOWN;
-
-            boolean blockRegistration = false;
-
-            // Extract username and determine the login method
             Object principal = authentication.getPrincipal();
             String username = null;
             if (principal instanceof UserDetails) {
                 username = ((UserDetails) principal).getUsername();
-                loginMethod = LoginMethod.USERDETAILS;
             } else if (principal instanceof OAuth2User) {
                 username = ((OAuth2User) principal).getName();
-                loginMethod = LoginMethod.OAUTH2USER;
-                OAUTH2 oAuth = securityProp.getOauth2();
-                blockRegistration = oAuth != null && oAuth.getBlockRegistration();
             } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
                 username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
-                loginMethod = LoginMethod.SAML2USER;
-                SAML2 saml2 = securityProp.getSaml2();
-                blockRegistration = saml2 != null && saml2.getBlockRegistration();
             } else if (principal instanceof String) {
                 username = (String) principal;
-                loginMethod = LoginMethod.STRINGUSER;
             }
 
-            // Retrieve all active sessions for the user
             List<SessionInformation> sessionsInformations =
                     sessionPersistentRegistry.getAllSessions(principal, false);
 
-            // Check if the user exists, is disabled, or needs session invalidation
             if (username != null) {
-                log.debug("Validating user: {}", username);
                 boolean isUserExists = userService.usernameExistsIgnoreCase(username);
                 boolean isUserDisabled = userService.isUserDisabled(username);
 
-                boolean notSsoLogin =
-                        !loginMethod.equals(LoginMethod.OAUTH2USER)
-                                && !loginMethod.equals(LoginMethod.SAML2USER);
-
-                // Block user registration if not allowed by configuration
-                if (blockRegistration && !isUserExists) {
-                    log.warn("Blocked registration for OAuth2/SAML user: {}", username);
-                    response.sendRedirect(
-                            request.getContextPath() + "/logout?oauth2_admin_blocked_user=true");
-                    return;
-                }
-
-                // Expire sessions and logout if the user does not exist or is disabled
                 if (!isUserExists || isUserDisabled) {
-                    log.info(
-                            "Invalidating session for disabled or non-existent user: {}", username);
                     for (SessionInformation sessionsInformation : sessionsInformations) {
                         sessionsInformation.expireNow();
                         sessionPersistentRegistry.expireSession(sessionsInformation.getSessionId());
                     }
                 }
 
-                // Redirect to logout if credentials are invalid
+                if (!isUserExists) {
-                if (!isUserExists && notSsoLogin) {
                     response.sendRedirect(request.getContextPath() + "/logout?badcredentials=true");
                     return;
                 }
@@ -204,25 +161,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         filterChain.doFilter(request, response);
     }
 
-    private enum LoginMethod {
-        USERDETAILS("UserDetails"),
-        OAUTH2USER("OAuth2User"),
-        STRINGUSER("StringUser"),
-        UNKNOWN("Unknown"),
-        SAML2USER("Saml2User");
-
-        private String method;
-
-        LoginMethod(String method) {
-            this.method = method;
-        }
-
-        @Override
-        public String toString() {
-            return method;
-        }
-    }
-
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
         String uri = request.getRequestURI();

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -163,9 +163,6 @@ public class AccountWebController {
                 case "invalid_destination":
                     erroroauth = "login.invalid_destination";
                     break;
-                case "relying_party_registration_not_found":
-                    erroroauth = "login.relyingPartyRegistrationNotFound";
-                    break;
                 // Valid InResponseTo was not available from the validation context, unable to
                 // evaluate
                 case "invalid_in_response_to":

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -13,8 +13,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.simpleyaml.configuration.file.YamlFile;
 import org.simpleyaml.configuration.file.YamlFileWrapper;
@@ -222,51 +220,32 @@ public class GeneralUtils {
             throw new IllegalArgumentException("Invalid expression");
         }
 
-        for (int n = 1; n <= maxValue; n++) {
+        int n = 0;
+        while (true) {
             // Replace 'n' with the current value of n, correctly handling numbers before
             // 'n'
-            String sanitizedExpression = sanitizeNFunction(expression, n);
+            String sanitizedExpression = insertMultiplicationBeforeN(expression, n);
             Double result = evaluator.evaluate(sanitizedExpression);
 
             // Check if the result is null or not within bounds
-            if (result == null)
+            if (result == null || result <= 0 || result.intValue() > maxValue) {
-                break;
+                if (n != 0) break;
-
+            } else {
-            if (result.intValue() > 0 && result.intValue() <= maxValue)
                 results.add(result.intValue());
+            }
+            n++;
         }
 
         return results;
     }
 
-    private static String sanitizeNFunction(String expression, int nValue) {
-        String sanitizedExpression = expression.replace(" ", "");
-        String multiplyByOpeningRoundBracketPattern = "([0-9n)])\\("; // example: n(n-1), 9(n-1), (n-1)(n-2)
-        sanitizedExpression = sanitizedExpression.replaceAll(multiplyByOpeningRoundBracketPattern, "$1*(");
-
-        String multiplyByClosingRoundBracketPattern = "\\)([0-9n)])"; // example: (n-1)n, (n-1)9, (n-1)(n-2)
-        sanitizedExpression = sanitizedExpression.replaceAll(multiplyByClosingRoundBracketPattern, ")*$1");
-
-        sanitizedExpression = insertMultiplicationBeforeN(sanitizedExpression, nValue);
-        return sanitizedExpression;
-    }
-
     private static String insertMultiplicationBeforeN(String expression, int nValue) {
         // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
         String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
-        withMultiplication = formatConsecutiveNsForNFunction(withMultiplication);
         // Now replace 'n' with its current value
         return withMultiplication.replace("n", String.valueOf(nValue));
     }
 
-    private static String formatConsecutiveNsForNFunction(String expression) {
-        String text = expression;
-        while (text.matches(".*n{2,}.*")) {
-            text = text.replaceAll("(?<!n)n{2}", "n*n");
-        }
-        return text;
-    }
-
     private static List<Integer> handlePart(String part, int totalPages, int offset) {
         List<Integer> partResult = new ArrayList<>();
 

src/main/resources/messages_ar_AR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=طلب غير صالح
 login.oauth2AccessDenied=تم رفض الوصول
 login.oauth2InvalidTokenResponse=استجابة الرمز المميز غير صالحة
 login.oauth2InvalidIdToken=رمز الهوية غير صالح
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=تم تعطيل المستخدم، تم حظر تسجيل الدخول حاليًا باستخدام اسم المستخدم هذا. يرجى الاتصال بالمسؤول.
 login.alreadyLoggedIn=لقد تسجل دخولًا إلى
 login.alreadyLoggedIn2=أجهزة أخرى. يرجى تسجيل الخروج من الأجهزة وحاول مرة أخرى.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=إصلاح
 repair.header=إصلاح ملفات PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=تقطيع ملف PDF
 fileChooser.click=انقر هنا
 fileChooser.or=أو
 fileChooser.dragAndDrop=قم بسحب الملفات وإفلاتها
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=قم بسحب المفات وإفلاتها هنا
 
 #release notes

src/main/resources/messages_az_AZ.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Etibarsız Sorğu
 login.oauth2AccessDenied=Giriş rədd edildi
 login.oauth2InvalidTokenResponse=Etibarsız Token Cavabı
 login.oauth2InvalidIdToken=Etibarsız Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=İstifadəçi deaktivləşdirilmişdir, bu istifadəçi adı ilə giriş hal-hazırda bloklanmışdır. Zəhmət olmasa, administratorla əlaqə saxlayın.
 login.alreadyLoggedIn=Siz artıq daxil olmusunuz
 login.alreadyLoggedIn2=cihazlar. Zəhmət olmasa, cihazlardan çıxış edin və yenidən cəhd edin.
@@ -831,7 +830,7 @@ sign.first=İlk səhifə
 sign.last=Son səhifə
 sign.next=Növbəti səhifə
 sign.previous=Əvvəlki səhifə
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Bərpa Et
 repair.header=PDFləri Bərpa Et
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF-i Ayır
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_bg_BG.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Невалидна заявка
 login.oauth2AccessDenied=Отказан достъп
 login.oauth2InvalidTokenResponse=Невалиден отговор на токена
 login.oauth2InvalidIdToken=Невалиден токен за идентификатор
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Потребителят е деактивиран, влизането в момента е блокирано с това потребителско име. Моля, свържете се с администратора.
 login.alreadyLoggedIn=Вече сте влезли в
 login.alreadyLoggedIn2=устройства. Моля, излезте от устройствата и опитайте отново.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Поправи
 repair.header=Поправи PDF-и
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Разделяне на PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_ca_CA.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Sol·licitud no vàlida
 login.oauth2AccessDenied=Accés denegat
 login.oauth2InvalidTokenResponse=Resposta de token no vàlida
 login.oauth2InvalidIdToken=ID Token no vàlid
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=L'usuari està desactivat, l'inici de sessió està actualment bloquejat amb aquest nom d'usuari. Si us plau, contacta amb l'administrador.
 login.alreadyLoggedIn=Ja has iniciat sessió a
 login.alreadyLoggedIn2=dispositius. Si us plau, tanca la sessió en els dispositius i torna-ho a intentar.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparar
 repair.header=Repara els PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Divideix PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_cs_CZ.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Neplatný požadavek
 login.oauth2AccessDenied=Přístup zazobán
 login.oauth2InvalidTokenResponse=Neplatná odpověď tokenu
 login.oauth2InvalidIdToken=Neplatný identifikační token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Uživatel je deaktivován, přihlášení aktuálně pro tuto uživatelskou jmena je zakázáno. Kontaktujte správce.
 login.alreadyLoggedIn=Jste již přihlášeni na
 login.alreadyLoggedIn2=zariadení. Odhlašujte se z těchto zařízení a zkuste to znovu.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Opravit
 repair.header=Opravit PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Podělit se PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_da_DK.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Ugyldig Anmodning
 login.oauth2AccessDenied=Adgang Nægtet
 login.oauth2InvalidTokenResponse=Ugyldigt Token Svar
 login.oauth2InvalidIdToken=Ugyldigt Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Bruger er deaktiveret, login er i øjeblikket blokeret med dette brugernavn. Kontakt venligst administratoren.
 login.alreadyLoggedIn=Du er allerede logget ind på
 login.alreadyLoggedIn2=enheder. Log ud af disse enheder og prøv igen.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparér
 repair.header=Reparér PDF'er
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Splitter PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_de_DE.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=ungültige Anfrage
 login.oauth2AccessDenied=Zugriff abgelehnt
 login.oauth2InvalidTokenResponse=Ungültige Token-Antwort
 login.oauth2InvalidIdToken=Ungültiges ID-Token
-login.relyingPartyRegistrationNotFound=Keine Relying-Party-Registrierung gefunden
 login.userIsDisabled=Benutzer ist deaktiviert, die Anmeldung ist mit diesem Benutzernamen derzeit gesperrt. Bitte wenden Sie sich an den Administrator.
 login.alreadyLoggedIn=Sie sind bereits an
 login.alreadyLoggedIn2=Geräten angemeldet. Bitte melden Sie sich dort ab und versuchen es dann erneut.
@@ -831,7 +830,7 @@ sign.first=Erste Seite
 sign.last=Letzte Seite
 sign.next=Nächste Seite
 sign.previous=Vorherige Seite
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparieren
 repair.header=PDFs reparieren
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF teilen
 fileChooser.click=Klicken
 fileChooser.or=oder
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Datei(en) hierhin Ziehen & Fallenlassen
 
 #release notes

src/main/resources/messages_el_GR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Αρχαίως απαιτήσεις πληροφορ
 login.oauth2AccessDenied=Πρόσβαση ορισμένες τοποθετήσεις
 login.oauth2InvalidTokenResponse=Απάντηση άρκετο ρόταμα
 login.oauth2InvalidIdToken=Λιδός όρκου μη αρκετός
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Ο χρήστης είναι δευτεροβαθμιακά διακωμένος, το σύστημα άλλαξε τον καθώς βρεθεί. Παρακαλείστε τους αρχηγούς να επιβεβαιώσουν τη συμπεριφορά χρήστη.
 login.alreadyLoggedIn=Είστε ήδη σύνδεδες σε
 login.alreadyLoggedIn2=κατοχόι. Παρακαλώ δυσκέντρωση τους και προσπαθήστε ξανά.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Επιδιόρθωση
 repair.header=Επιδιόρθωση PDFs
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Διαλύστε το PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_en_GB.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Repair
 repair.header=Repair PDFs
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_en_US.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Repair
 repair.header=Repair PDFs
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_es_ES.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Solicitud no válida
 login.oauth2AccessDenied=Acceso denegado
 login.oauth2InvalidTokenResponse=Respuesta de token no válida
 login.oauth2InvalidIdToken=Token de identificación no válido
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=El usuario está desactivado, actualmente el acceso está bloqueado para ese nombre de usuario. Por favor, póngase en contacto con el administrador.
 login.alreadyLoggedIn=Ya has iniciado sesión en
 login.alreadyLoggedIn2=dispositivos. Cierra sesión en los dispositivos y vuelve a intentarlo.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparar
 repair.header=Reparar archivos PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Dividir PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_eu_ES.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Konpondu
 repair.header=Konpondu PDF fitxategiak
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_fa_IR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=درخواست نامعتبر
 login.oauth2AccessDenied=دسترسی ممنوع
 login.oauth2InvalidTokenResponse=پاسخ توکن نامعتبر است
 login.oauth2InvalidIdToken=توکن شناسه نامعتبر است
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=کاربر غیرفعال شده است، ورود با این نام کاربری در حال حاضر مسدود است. لطفاً با مدیر تماس بگیرید.
 login.alreadyLoggedIn=شما قبلاً وارد شده‌اید در
 login.alreadyLoggedIn2=دستگاه‌ها. لطفاً از دستگاه‌ها خارج شده و دوباره تلاش کنید.
@@ -831,7 +830,7 @@ sign.first=صفحه اول
 sign.last=صفحه آخر
 sign.next=صفحه بعدی
 sign.previous=صفحه قبلی
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=تعمیر
 repair.header=تعمیر PDFها
@@ -1285,8 +1284,6 @@ splitByChapters.submit=تقسیم PDF
 fileChooser.click=کلیک کنید
 fileChooser.or=یا
 fileChooser.dragAndDrop=بکشید و رها کنید
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=فایل(های) خود را اینجا بکشید و رها کنید
 
 #release notes

src/main/resources/messages_fr_FR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Requête invalide
 login.oauth2AccessDenied=Accès refusé
 login.oauth2InvalidTokenResponse=Réponse contenant le jeton est invalide
 login.oauth2InvalidIdToken=Jeton d'identification invalide
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=L'utilisateur est désactivé, la connexion est actuellement bloquée avec ce nom d'utilisateur. Veuillez contacter l'administrateur.
 login.alreadyLoggedIn=Vous êtes déjà connecté sur
 login.alreadyLoggedIn2=appareils. Veuillez vous déconnecter des appareils et réessayer.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Réparer
 repair.header=Réparer
@@ -1282,51 +1281,49 @@ splitByChapters.desc.4=Autoriser les Doublons : Si coché, permet à plusieurs s
 splitByChapters.submit=Diviser le PDF
 
 #File Chooser
-fileChooser.click=Cliquez
+fileChooser.click=Click
-fileChooser.or=ou
+fileChooser.or=or
-fileChooser.dragAndDrop=Glisser & Déposer
+fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
+fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
-fileChooser.dragAndDropImage=Drag & Drop Image file
-fileChooser.hoveredDragAndDrop=Glisser & Déposer le(s) fichier(s) ici
 
 #release notes
-releases.footer=Versions
+releases.footer=Releases
-releases.title=Notes de version
+releases.title=Release Notes
-releases.header=Notes de version
+releases.header=Release Notes
-releases.current.version=Version actuelle
+releases.current.version=Current Release
-releases.note=Les notes de version sont uniquement disponibles en anglais
+releases.note=Release notes are only available in English
 
 #Validate Signature
-validateSignature.title=Valider les signatures PDF
+validateSignature.title=Validate PDF Signatures
-validateSignature.header=Valider les signatures numériques
+validateSignature.header=Validate Digital Signatures
-validateSignature.selectPDF=Sélectionnez un fichier PDF signé
+validateSignature.selectPDF=Select signed PDF file
-validateSignature.submit=Valider les signatures
+validateSignature.submit=Validate Signatures
-validateSignature.results=Résultats de la validation
+validateSignature.results=Validation Results
-validateSignature.status=Statut
+validateSignature.status=Status
-validateSignature.signer=Signataire
+validateSignature.signer=Signer
 validateSignature.date=Date
-validateSignature.reason=Raison
+validateSignature.reason=Reason
-validateSignature.location=Localisation
+validateSignature.location=Location
-validateSignature.noSignatures=Aucune signature numérique trouvée dans ce document
+validateSignature.noSignatures=No digital signatures found in this document
-validateSignature.status.valid=Valide
+validateSignature.status.valid=Valid
-validateSignature.status.invalid=Invalide
+validateSignature.status.invalid=Invalid
-validateSignature.chain.invalid=La validation de la chaîne de certificats a échoué - impossible de vérifier l'identité du signataire
+validateSignature.chain.invalid=Certificate chain validation failed - cannot verify signer's identity
-validateSignature.trust.invalid=Le certificat n'est pas dans le magasin de confiance - la source ne peut pas être vérifiée
+validateSignature.trust.invalid=Certificate not in trust store - source cannot be verified
-validateSignature.cert.expired=Le certificat a expiré
+validateSignature.cert.expired=Certificate has expired
-validateSignature.cert.revoked=Le certificat a été révoqué
+validateSignature.cert.revoked=Certificate has been revoked
-validateSignature.signature.info=Informations sur la signature
+validateSignature.signature.info=Signature Information
 validateSignature.signature=Signature
-validateSignature.signature.mathValid=La signature est mathématiquement valide MAIS :
+validateSignature.signature.mathValid=Signature is mathematically valid BUT:
-validateSignature.selectCustomCert=Fichier de certificat personnalisé X.509 (Optionnel)
+validateSignature.selectCustomCert=Custom Certificate File X.509 (Optional)
-validateSignature.cert.info=Détails du certificat
+validateSignature.cert.info=Certificate Details
-validateSignature.cert.issuer=Émetteur
+validateSignature.cert.issuer=Issuer
-validateSignature.cert.subject=Sujet
+validateSignature.cert.subject=Subject
-validateSignature.cert.serialNumber=Numéro de série
+validateSignature.cert.serialNumber=Serial Number
-validateSignature.cert.validFrom=Valide à partir du
+validateSignature.cert.validFrom=Valid From
-validateSignature.cert.validUntil=Valide jusqu'au
+validateSignature.cert.validUntil=Valid Until
-validateSignature.cert.algorithm=Algorithme
+validateSignature.cert.algorithm=Algorithm
-validateSignature.cert.keySize=Taille de la clé
+validateSignature.cert.keySize=Key Size
 validateSignature.cert.version=Version
-validateSignature.cert.keyUsage=Usage de la clé
+validateSignature.cert.keyUsage=Key Usage
-validateSignature.cert.selfSigned=Auto-signé
+validateSignature.cert.selfSigned=Self-Signed
 validateSignature.cert.bits=bits

src/main/resources/messages_ga_IE.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Iarratas Neamhbhailí
 login.oauth2AccessDenied=Rochtain Diúltaithe
 login.oauth2InvalidTokenResponse=Freagra Comhartha Neamhbhailí
 login.oauth2InvalidIdToken=Comhartha Aitheantais Neamhbhailí
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Deisiúchán
 repair.header=PDF a dheisiú
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_hi_IN.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=गलत याचना
 login.oauth2AccessDenied=इनपुट उम्मीदवार डिसकार
 login.oauth2InvalidTokenResponse=अमान्तरित सिक्वेंस जवाब कैसे है
 login.oauth2InvalidIdToken=गलत इड टोकन
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=उपयोगकर्ता डिसबाल, यह वर्षा सभी उपयोगकर्ता जूझे वर्षाकरण बारा मिल गई है। कृपया संबवादक से संपर्क करें.
 login.alreadyLoggedIn=आप पहले से ही
 login.alreadyLoggedIn2=सुनिश्चित करने वाले डिवाइस्स पर लॉग-इन हैं। कृपया इन डिवाइस से लॉगआउट करें और पुनः प्रयास करें
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=मरम्मत
 repair.header=पीडीएफ़ मरम्मत करें
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF विभाजित
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_hr_HR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Neispravan zahtjev
 login.oauth2AccessDenied=Pristup odbijen
 login.oauth2InvalidTokenResponse=Nevažeći odgovor tokena
 login.oauth2InvalidIdToken=Nevažeći ID token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Korisnik je deaktiviran, prijava sa ovim korisničkim imenom je trenutno zakazana. Molimo Vas da kontaktirate administratorske osobe.
 login.alreadyLoggedIn=Već ste se prijavili na
 login.alreadyLoggedIn2=ure. Odjavite se s ure i pokušajte ponovo.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Popravi
 repair.header=Popravi PDF datoteku
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Podijeli PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_hu_HU.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Érvénytelen kérelem
 login.oauth2AccessDenied=Hozzáférés megtagadva
 login.oauth2InvalidTokenResponse=Érvénytelen token-válasz
 login.oauth2InvalidIdToken=Érvénytelen azonosító token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=A felhasználó deaktivált, a bejelentkezés jelenleg megszakítva ezzel a felhasználónévvel. Kérjen segítséget a rendszergazdától.
 login.alreadyLoggedIn=Már be van jelentkezve az
 login.alreadyLoggedIn2=eszközökre. Kijelentkezzen ezekből a eszközökből, majd próbálja újra bejelentkezni.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Javítás
 repair.header=PDF-ek javítása
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF osztás
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_id_ID.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Permintaan Tidak Valid
 login.oauth2AccessDenied=Akses Ditolak
 login.oauth2InvalidTokenResponse=Respons Token Tidak Valid
 login.oauth2InvalidIdToken=Token ID Tidak Valid
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Pengguna dinonaktifkan, login saat ini diblokir dengan nama pengguna ini. Silakan hubungi administrator.
 login.alreadyLoggedIn=Anda sudah login ke
 login.alreadyLoggedIn2=perangkat. Silakan keluar dari perangkat dan coba lagi.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Perbaiki
 repair.header=Perbaiki PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Pecah PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_it_IT.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Richiesta non valida
 login.oauth2AccessDenied=Accesso negato
 login.oauth2InvalidTokenResponse=Risposta token non valida
 login.oauth2InvalidIdToken=Id Token non valido
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato con questo nome utente. Si prega di contattare l'amministratore.
 login.alreadyLoggedIn=Hai già effettuato l'accesso a
 login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova.
@@ -831,7 +830,7 @@ sign.first=Prima pagina
 sign.last=Ultima pagina
 sign.next=Prossima pagina
 sign.previous=Pagina precedente
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Ripara
 repair.header=Ripara PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Dividi PDF
 fileChooser.click=Clicca
 fileChooser.or=o
 fileChooser.dragAndDrop=Trascina & Rilascia
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Trascina & rilascia i file qui
 
 #release notes

src/main/resources/messages_ja_JP.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=無効なリクエスト
 login.oauth2AccessDenied=アクセス拒否
 login.oauth2InvalidTokenResponse=無効なトークン応答
 login.oauth2InvalidIdToken=無効なIDトークン
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=ユーザーは非アクティブ化されており、現在このユーザー名でのログインはブロックされています。管理者に連絡してください。
 login.alreadyLoggedIn=すでにログインしています
 login.alreadyLoggedIn2=デバイスからログアウトしてもう一度お試しください。
@@ -831,7 +830,7 @@ sign.first=最初のページ
 sign.last=最後のページ
 sign.next=次のページ
 sign.previous=前のページ
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=修復
 repair.header=PDFを修復
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDFを分割
 fileChooser.click=クリック
 fileChooser.or=または
 fileChooser.dragAndDrop=ドラッグ＆ドロップ
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=ファイルをここにドラッグ＆ドロップ
 
 #release notes

src/main/resources/messages_ko_KR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=복구
 repair.header=PDF 복구
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF 분할
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_nl_NL.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Ongeldig verzoek
 login.oauth2AccessDenied=Toegang geweigerd
 login.oauth2InvalidTokenResponse=Ongeldige tokenreactie
 login.oauth2InvalidIdToken=Ongeldige ID token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=De gebruiker is gedesactiveerd, inloggen is momenteel geblokkeerd voor deze gebruikersnaam. Neem contact op met de beheerder.
 login.alreadyLoggedIn=U zit reeds ingelogd bij
 login.alreadyLoggedIn2=apparaten. U moet u a.u.b. uitloggen van de apparaten en opnieuw proberen.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Repareren
 repair.header=PDF's repareren
@@ -1285,8 +1284,6 @@ splitByChapters.submit=PDF splitsen
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_no_NB.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Ugyldig forespørsel
 login.oauth2AccessDenied=Tilgang nektet
 login.oauth2InvalidTokenResponse=Ugyldig tokenrespons
 login.oauth2InvalidIdToken=Ugyldig Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparer
 repair.header=Reparer PDF-er
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_pl_PL.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Nieprawidłowe żądanie
 login.oauth2AccessDenied=Brak dostępu
 login.oauth2InvalidTokenResponse=Nieprawidłowa odpowiedź na token
 login.oauth2InvalidIdToken=Nieprawidłowa wartość tokenu
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Użytkownik jest nieaktywny, logowanie przy użyciu tej nazwy użytkownika jest obecnie zablokowane. Prosimy o kontakt z administratorem.
 login.alreadyLoggedIn=Jesteś już zalogowany na
 login.alreadyLoggedIn2=urządzeniach. Wyloguj się z tych urządzeń i spróbuj ponownie.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Napraw
 repair.header=Napraw dokument(y) PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Podziel PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_pt_BR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Requisição Inválida
 login.oauth2AccessDenied=Acesso Negado
 login.oauth2InvalidTokenResponse=Resposta de Token Inválida
 login.oauth2InvalidIdToken=Id de Token Inválido
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=O usuário está desativado, o login está atualmente bloqueado com este nome de usuário. Entre em contato com o administrador.
 login.alreadyLoggedIn=Você já está conectado em
 login.alreadyLoggedIn2=aparelhos. Por favor saia dos aparelhos e tente novamente.
@@ -831,7 +830,7 @@ sign.first=Primeira página
 sign.last=Última página
 sign.next=Próxima página
 sign.previous=Página anterior
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparar
 repair.header=Reparar
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Dividir
 fileChooser.click=Clique
 fileChooser.or=ou
 fileChooser.dragAndDrop=Arraste & Solte
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Arraste & Solte arquivo(s) aqui
 
 #release notes

src/main/resources/messages_pt_PT.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Requisito inválido
 login.oauth2AccessDenied=Acesso negado
 login.oauth2InvalidTokenResponse=Resposta de token inválida
 login.oauth2InvalidIdToken=Token de identificação inválido
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=O utilizador foi desativado, o login está atualmente bloqueado com esta conta. Por favor, contacte o administrador.
 login.alreadyLoggedIn=Já está logado em
 login.alreadyLoggedIn2=dispositivos. Por favor, faça logout nos dispositivos e tente novamente.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparar
 repair.header=Reparar PDFs
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Dividir o PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_ro_RO.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Cerere Invalidă
 login.oauth2AccessDenied=Acces Refuzat
 login.oauth2InvalidTokenResponse=Răspuns Invalid la Token
 login.oauth2InvalidIdToken=Token de Id Invalid
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Utilizatorul este dezactivat, conectarea este în prezent blocată cu acest nume de utilizator. Te rugăm să contactezi administratorul.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Repară
 repair.header=Repară documente PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_ru_RU.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Неверный запрос
 login.oauth2AccessDenied=Доступ запрещен
 login.oauth2InvalidTokenResponse=Недействительный ответ токена
 login.oauth2InvalidIdToken=Недействительный идентификационный токен
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Пользователь деактивирован, вход с данным именем пользователя заблокирован. Пожалуйста, обратитесь к администратору.
 login.alreadyLoggedIn=Вы уже вошли в
 login.alreadyLoggedIn2=устройства. Выполните выход из устройств и попробуйте снова.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Ремонт
 repair.header=Ремонт PDF ов
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Разделить PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_sk_SK.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Opraviť
 repair.header=Opraviť PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_sr_LATN_RS.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
 login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Popravi
 repair.header=Popravi PDF fajlove
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_sv_SE.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Ogiltig begäran
 login.oauth2AccessDenied=Åtkomst nekad
 login.oauth2InvalidTokenResponse=Ogiltigt token-svar
 login.oauth2InvalidIdToken=Ogiltigt Id-token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Användaren är inaktiverad, inloggning är för närvarande blockerad med detta användarnamn. Kontakta administratören.
 login.alreadyLoggedIn=Du är redan inloggad på
 login.alreadyLoggedIn2=enheter. Logga ut från enheterna och försök igen.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Reparera
 repair.header=Reparera PDF-filer
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Dela upp PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_th_TH.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=คำขอไม่ถูกต้อง
 login.oauth2AccessDenied=การเข้าถึงถูกปฏิเสธ
 login.oauth2InvalidTokenResponse=การตอบกลับโทเค็นไม่ถูกต้อง
 login.oauth2InvalidIdToken=โทเค็น Id ไม่ถูกต้อง
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=ผู้ใช้งานถูกระงับการใช้งาน ไม่สามารถเข้าสู่ระบบด้วยชื่อผู้ใช้นี้ได้ กรุณาติดต่อผู้ดูแลระบบ
 login.alreadyLoggedIn=คุณได้เข้าสู่ระบบใน
 login.alreadyLoggedIn2=อุปกรณ์แล้ว กรุณาออกจากระบบจากอุปกรณ์ที่ใช้งานอยู่แล้ว จากนั้นลองใหม่อีกครั้ง
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=ซ่อมแซม
 repair.header=ซ่อมแซม PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=แบ่งไฟล์ PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_tr_TR.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Geçersiz İstek
 login.oauth2AccessDenied=Erişim Reddedildi
 login.oauth2InvalidTokenResponse=Geçersiz Belirteç Yanıtı
 login.oauth2InvalidIdToken=Geçersiz Kimlik Belirteci
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=Kullanıcı devre dışı bırakıldı, şu anda bu kullanıcı adıyla giriş engellendi. Lütfen yöneticiyle iletişime geçin.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Onar
 repair.header=PDF'leri Onar
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_uk_UA.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Недійсний запит
 login.oauth2AccessDenied=Доступ заблоковано
 login.oauth2InvalidTokenResponse=Недійсна відповідь з токеном
 login.oauth2InvalidIdToken=Недійсний Id токен
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Ремонт
 repair.header=Ремонт PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_vi_VN.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=Yêu cầu không hợp lệ
 login.oauth2AccessDenied=Truy cập bị từ chối
 login.oauth2InvalidTokenResponse=Phản hồi token không hợp lệ
 login.oauth2InvalidIdToken=Id Token không hợp lệ
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
 login.alreadyLoggedIn=You are already logged in to
 login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
@@ -831,7 +830,7 @@ sign.first=First page
 sign.last=Last page
 sign.next=Next page
 sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=Sửa chữa
 repair.header=Sửa chữa PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=Split PDF
 fileChooser.click=Click
 fileChooser.or=or
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
 
 #release notes

src/main/resources/messages_zh_CN.properties

@@ -561,7 +561,6 @@ login.oauth2invalidRequest=无效请求
 login.oauth2AccessDenied=拒绝访问
 login.oauth2InvalidTokenResponse=无效的 Token 响应
 login.oauth2InvalidIdToken=无效的 Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=用户被禁用，登录已被阻止。请联系管理员。
 login.alreadyLoggedIn=您已经登录到了
 login.alreadyLoggedIn2=设备，请注销设备后重试。
@@ -831,7 +830,7 @@ sign.first=首页
 sign.last=末页
 sign.next=下一页
 sign.previous=上一页
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=修复
 repair.header=修复 PDF
@@ -1285,8 +1284,6 @@ splitByChapters.submit=拆分 PDF
 fileChooser.click=单击
 fileChooser.or=或
 fileChooser.dragAndDrop=拖放文件
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=拖放文件到此处
 
 #release notes

src/main/resources/messages_zh_TW.properties

@@ -81,7 +81,7 @@ page=頁面
 pages=頁面
 loading=載入中...
 addToDoc=新增至文件
-reset=重設
+reset=Reset
 
 legal.privacy=隱私權政策
 legal.terms=使用條款
@@ -142,7 +142,7 @@ navbar.language=語言
 navbar.settings=設定
 navbar.allTools=工具
 navbar.multiTool=複合工具
-navbar.search=搜尋
+navbar.search=Search
 navbar.sections.organize=整理
 navbar.sections.convertTo=轉換為 PDF
 navbar.sections.convertFrom=從 PDF 轉換
@@ -238,13 +238,13 @@ database.creationDate=建立日期
 database.fileSize=檔案大小
 database.deleteBackupFile=刪除備份檔案
 database.importBackupFile=匯入備份檔案
-database.createBackupFile=建立備份檔案
+database.createBackupFile=Create Backup File
 database.downloadBackupFile=下載備份檔案
 database.info_1=在匯入資料時，確保正確的結構至關重要。如果您不確定自己在做什麼，請尋求專業人士的建議和支援。結構錯誤可能會導致應用程式故障，甚至完全無法執行應用程式。
 database.info_2=上傳時檔案名稱並不重要。上傳後將重新命名為 backup_user_yyyyMMddHHmm.sql 格式，以確保命名規範一致。
 database.submit=匯入備份
 database.importIntoDatabaseSuccessed=成功匯入資料庫
-database.backupCreated=資料庫備份成功
+database.backupCreated=Database backup successful
 database.fileNotFound=找不到檔案
 database.fileNullOrEmpty=檔案不得為空或空白
 database.failedImportFile=匯入檔案失敗
@@ -255,7 +255,7 @@ session.refreshPage=重新整理頁面
 #############
 # HOME-PAGE #
 #############
-home.desc=您的本機一站式 PDF 解決方案。
+home.desc=你的本機主機一站式 PDF 需求解決方案。
 home.searchBar=搜尋功能...
 
 
@@ -514,9 +514,9 @@ home.splitPdfByChapters.title=依章節分割 PDF
 home.splitPdfByChapters.desc=根據 PDF 的章節結構將其分割成多個檔案。
 splitPdfByChapters.tags=分割,章節,書籤,整理
 
-home.validateSignature.title=驗證 PDF 簽章
+home.validateSignature.title=Validate PDF Signature
-home.validateSignature.desc=驗證 PDF 文件中的數位簽章與憑證
+home.validateSignature.desc=Verify digital signatures and certificates in PDF documents
-validateSignature.tags=簽章,驗證,確認,pdf,憑證,數位簽章,驗證簽章,驗證憑證
+validateSignature.tags=signature,verify,validate,pdf,certificate,digital signature,Validate Signature,Validate certificate
 
 #replace-invert-color
 replace-color.title=取代-反轉顏色
@@ -561,7 +561,6 @@ login.oauth2invalidRequest=無效的回應
 login.oauth2AccessDenied=存取被拒
 login.oauth2InvalidTokenResponse=無效的權杖回應
 login.oauth2InvalidIdToken=無效的識別權杖
-login.relyingPartyRegistrationNotFound=No relying party registration found
 login.userIsDisabled=使用者已停用，目前此使用者無法登入。請聯絡系統管理員。
 login.alreadyLoggedIn=您已經登入了
 login.alreadyLoggedIn2=個裝置。請登出其他裝置後再試一次。
@@ -630,12 +629,12 @@ HTMLToPDF.help=接受 HTML 文件和包含所需 html/css/images 等的 ZIP
 HTMLToPDF.submit=轉換
 HTMLToPDF.credit=此服務使用 WeasyPrint 進行轉換
 HTMLToPDF.zoom=用於顯示網站的縮放級別。
-HTMLToPDF.pageWidth=頁面寬度-以公分為單位（留空則使用預設值）
+HTMLToPDF.pageWidth=頁面寬度-以釐米為單位（填空則使用預設值）
-HTMLToPDF.pageHeight=頁面高度-以公分為單位（留空則使用預設值）
+HTMLToPDF.pageHeight=頁面高度-以釐米為單位（填空則使用預設值）
-HTMLToPDF.marginTop=頁面的上邊距-以毫米為單位（留空則使用預設值）
+HTMLToPDF.marginTop=頁面的上邊距-以毫米為單位（填空則使用預設值）
-HTMLToPDF.marginBottom=頁面的下邊距-以毫米為單位（留空則使用預設值）
+HTMLToPDF.marginBottom=頁面的下邊距-以毫米為單位（填空則使用預設值）
-HTMLToPDF.marginLeft=頁面的左邊距-以毫米為單位（留空則使用預設值）
+HTMLToPDF.marginLeft=頁面的左邊距-以毫米為單位（填空則使用預設值）
-HTMLToPDF.marginRight=頁面的右邊距-以毫米為單位（留空則使用預設值）
+HTMLToPDF.marginRight=頁面的右邊距-以毫米為單位（填空則使用預設值）
 HTMLToPDF.printBackground=渲染網站的背景。
 HTMLToPDF.defaultHeader=啟用預設標頭（名稱和頁碼）
 HTMLToPDF.cssMediaType=更改頁面的 CSS 媒體類型。
@@ -749,13 +748,13 @@ scalePages.submit=送出
 certSign.title=憑證簽章
 certSign.header=使用你的憑證簽章（進行中）
 certSign.selectPDF=選擇要簽章的 PDF 檔案：
-certSign.jksNote=注意：如果你的證書類型未被列在下方，請使用 keytool 命令列工具將其轉換為 Java Keystore （.jks） 檔案格式，然後選擇下面的 .jks 檔案選項。
+certSign.jksNote=注意：如果你的證書類型未在下面列出，請使用 keytool 命令列工具將其轉換為 Java Keystore （.jks） 檔。 然後，選擇下面的 .jks 文件選項。
-certSign.selectKey=選擇你的私鑰檔案（PKCS#8 格式，副檔名可能是 .pem 或 .der）：
+certSign.selectKey=選擇你的私鑰文件（PKCS#8 格式，可能是 .pem 或 .der）：
-certSign.selectCert=選擇你的憑證檔案（X.509 格式，副檔名可能是 .pem 或 .der）：
+certSign.selectCert=選擇你的憑證文件（X.509 格式，可能是 .pem 或 .der）：
-certSign.selectP12=選擇你的 PKCS#12 金鑰庫檔案（副檔名可能是 .p12 或 .pfx）（選填，如果有提供，則它應該包含你的私鑰和憑證）：
+certSign.selectP12=選擇你的 PKCS#12 金鑰庫文件（.p12 或 .pfx）（可選，如果提供，它應包含你的私鑰和憑證）：
-certSign.selectJKS=選擇你的 Java Keystore 檔案 （副檔名可能是 .jks 或 .keystore）：
+certSign.selectJKS=選擇你的 Java Keystore 檔 （.jks 或 .keystore）：
 certSign.certType=憑證類型
-certSign.password=輸入你的金鑰庫或私鑰密碼（如果有的話）：
+certSign.password=輸入你的金鑰庫或私鑰密碼（如果有）：
 certSign.showSig=顯示簽章
 certSign.reason=原因
 certSign.location=位置
@@ -825,13 +824,13 @@ sign.save=儲存簽章
 sign.personalSigs=個人簽章
 sign.sharedSigs=共用簽章
 sign.noSavedSigs=尚未儲存任何簽章
-sign.addToAll=新增至所有頁面
+sign.addToAll=Add to all pages
-sign.delete=刪除
+sign.delete=Delete
-sign.first=第一頁
+sign.first=First page
-sign.last=最後一頁
+sign.last=Last page
-sign.next=下一頁
+sign.next=Next page
-sign.previous=上一頁
+sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+
 #repair
 repair.title=修復
 repair.header=修復 PDF
@@ -947,39 +946,39 @@ pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1）
 multiTool.title=PDF 複合工具
 multiTool.header=PDF 複合工具
 multiTool.uploadPrompts=檔名
-multiTool.selectAll=全選
+multiTool.selectAll=Select All
-multiTool.deselectAll=取消全選
+multiTool.deselectAll=Deselect All
-multiTool.selectPages=選取頁面
+multiTool.selectPages=Page Select
-multiTool.selectedPages=已選取的頁面
+multiTool.selectedPages=Selected Pages
-multiTool.page=頁面
+multiTool.page=Page
-multiTool.deleteSelected=刪除已選取的項目
+multiTool.deleteSelected=Delete Selected
-multiTool.downloadAll=匯出
+multiTool.downloadAll=Export
-multiTool.downloadSelected=匯出已選取的項目
+multiTool.downloadSelected=Export Selected
 
-multiTool.insertPageBreak=插入分頁符號
+multiTool.insertPageBreak=Insert Page Break
-multiTool.addFile=新增檔案
+multiTool.addFile=Add File
-multiTool.rotateLeft=向左旋轉
+multiTool.rotateLeft=Rotate Left
-multiTool.rotateRight=向右旋轉
+multiTool.rotateRight=Rotate Right
-multiTool.split=分割
+multiTool.split=Split
-multiTool.moveLeft=向左移動
+multiTool.moveLeft=Move Left
-multiTool.moveRight=向右移動
+multiTool.moveRight=Move Right
-multiTool.delete=刪除
+multiTool.delete=Delete
-multiTool.dragDropMessage=已選取的頁面
+multiTool.dragDropMessage=Page(s) Selected
-multiTool.undo=復原
+multiTool.undo=Undo
-multiTool.redo=重做
+multiTool.redo=Redo
 
 #decrypt
-decrypt.passwordPrompt=此檔案已受密碼保護。請輸入密碼：
+decrypt.passwordPrompt=This file is password-protected. Please enter the password:
-decrypt.cancelled=已取消處理 PDF：{0}
+decrypt.cancelled=Operation cancelled for PDF: {0}
-decrypt.noPassword=未提供加密 PDF 的密碼：{0}
+decrypt.noPassword=No password provided for encrypted PDF: {0}
-decrypt.invalidPassword=請重新輸入正確的密碼。
+decrypt.invalidPassword=Please try again with the correct password.
-decrypt.invalidPasswordHeader=密碼錯誤或不支援的加密方式，PDF：{0}
+decrypt.invalidPasswordHeader=Incorrect password or unsupported encryption for PDF: {0}
-decrypt.unexpectedError=處理檔案時發生錯誤。請再試一次。
+decrypt.unexpectedError=There was an error processing the file. Please try again.
-decrypt.serverError=解密時發生伺服器錯誤：{0}
+decrypt.serverError=Server error while decrypting: {0}
-decrypt.success=檔案已成功解密。
+decrypt.success=File decrypted successfully.
 
 #multiTool-advert
-multiTool-advert.message=此功能也可以在我們的<a href="{0}">複合工具頁面</a>中使用。前往查看並體驗更強大的逐頁操作介面及其他進階功能！
+multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=檢視 PDF
@@ -1196,7 +1195,7 @@ split-by-size-or-count.submit=送出
 
 #overlay-pdfs
 overlay-pdfs.header=覆蓋 PDF 檔案
-overlay-pdfs.baseFile.label=選擇基底 PDF 檔案
+overlay-pdfs.baseFile.label=選擇基礎 PDF 檔案
 overlay-pdfs.overlayFiles.label=選擇覆蓋 PDF 檔案
 overlay-pdfs.mode.label=選擇覆蓋模式
 overlay-pdfs.mode.sequential=序列覆蓋
@@ -1282,51 +1281,49 @@ splitByChapters.desc.4=允許重複：如果勾選，允許同一頁面上的多
 splitByChapters.submit=分割 PDF
 
 #File Chooser
-fileChooser.click=點選
+fileChooser.click=Click
-fileChooser.or=或
+fileChooser.or=or
-fileChooser.dragAndDrop=拖放檔案
+fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
+fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
-fileChooser.dragAndDropImage=Drag & Drop Image file
-fileChooser.hoveredDragAndDrop=將檔案拖放至此
 
 #release notes
-releases.footer=版本資訊
+releases.footer=Releases
-releases.title=版本資訊
+releases.title=Release Notes
-releases.header=版本資訊
+releases.header=Release Notes
-releases.current.version=目前版本
+releases.current.version=Current Release
-releases.note=版本資訊僅提供英文版本
+releases.note=Release notes are only available in English
 
 #Validate Signature
-validateSignature.title=驗證 PDF 簽章
+validateSignature.title=Validate PDF Signatures
-validateSignature.header=驗證數位簽章
+validateSignature.header=Validate Digital Signatures
-validateSignature.selectPDF=選擇已簽章的 PDF 檔案
+validateSignature.selectPDF=Select signed PDF file
-validateSignature.submit=驗證簽章
+validateSignature.submit=Validate Signatures
-validateSignature.results=驗證結果
+validateSignature.results=Validation Results
-validateSignature.status=狀態
+validateSignature.status=Status
-validateSignature.signer=簽署者
+validateSignature.signer=Signer
-validateSignature.date=日期
+validateSignature.date=Date
-validateSignature.reason=原因
+validateSignature.reason=Reason
-validateSignature.location=位置
+validateSignature.location=Location
-validateSignature.noSignatures=此文件中未找到數位簽章
+validateSignature.noSignatures=No digital signatures found in this document
-validateSignature.status.valid=有效
+validateSignature.status.valid=Valid
-validateSignature.status.invalid=無效
+validateSignature.status.invalid=Invalid
-validateSignature.chain.invalid=憑證鏈驗證失敗 - 無法驗證簽署者身份
+validateSignature.chain.invalid=Certificate chain validation failed - cannot verify signer's identity
-validateSignature.trust.invalid=憑證不在信任儲存區中 - 無法驗證來源
+validateSignature.trust.invalid=Certificate not in trust store - source cannot be verified
-validateSignature.cert.expired=憑證已過期
+validateSignature.cert.expired=Certificate has expired
-validateSignature.cert.revoked=憑證已被撤銷
+validateSignature.cert.revoked=Certificate has been revoked
-validateSignature.signature.info=簽章資訊
+validateSignature.signature.info=Signature Information
-validateSignature.signature=簽章
+validateSignature.signature=Signature
-validateSignature.signature.mathValid=簽章在數學上有效，但：
+validateSignature.signature.mathValid=Signature is mathematically valid BUT:
-validateSignature.selectCustomCert=自訂 X.509 憑證檔案（選填）
+validateSignature.selectCustomCert=Custom Certificate File X.509 (Optional)
-validateSignature.cert.info=憑證詳細資訊
+validateSignature.cert.info=Certificate Details
-validateSignature.cert.issuer=發行者
+validateSignature.cert.issuer=Issuer
-validateSignature.cert.subject=主旨
+validateSignature.cert.subject=Subject
-validateSignature.cert.serialNumber=序號
+validateSignature.cert.serialNumber=Serial Number
-validateSignature.cert.validFrom=有效期自
+validateSignature.cert.validFrom=Valid From
-validateSignature.cert.validUntil=有效期至
+validateSignature.cert.validUntil=Valid Until
-validateSignature.cert.algorithm=演算法
+validateSignature.cert.algorithm=Algorithm
-validateSignature.cert.keySize=金鑰長度
+validateSignature.cert.keySize=Key Size
-validateSignature.cert.version=版本
+validateSignature.cert.version=Version
-validateSignature.cert.keyUsage=金鑰用途
+validateSignature.cert.keyUsage=Key Usage
-validateSignature.cert.selfSigned=自我簽署
+validateSignature.cert.selfSigned=Self-Signed
-validateSignature.cert.bits=位元
+validateSignature.cert.bits=bits

src/main/resources/static/3rdPartyLicenses.json

@@ -45,77 +45,77 @@
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
             "moduleUrl": "https://github.com/FasterXML/jackson-core",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
             "moduleUrl": "https://github.com/FasterXML/jackson-dataformats-text",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
             "moduleUrl": "https://github.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-base",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
             "moduleUrl": "https://github.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-json-provider",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-base",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson:jackson-bom",
             "moduleUrl": "https://github.com/FasterXML/jackson-bom",
-            "moduleVersion": "2.18.2",
+            "moduleVersion": "2.18.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -441,7 +441,7 @@
         {
             "moduleName": "io.micrometer:micrometer-commons",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.2",
+            "moduleVersion": "1.14.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -455,14 +455,14 @@
         {
             "moduleName": "io.micrometer:micrometer-jakarta9",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.2",
+            "moduleVersion": "1.14.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-observation",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.2",
+            "moduleVersion": "1.14.1",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -628,7 +628,7 @@
         },
         {
             "moduleName": "net.bytebuddy:byte-buddy",
-            "moduleVersion": "1.15.11",
+            "moduleVersion": "1.15.10",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -710,13 +710,13 @@
         },
         {
             "moduleName": "org.apache.logging.log4j:log4j-api",
-            "moduleVersion": "2.24.3",
+            "moduleVersion": "2.24.1",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.logging.log4j:log4j-to-slf4j",
-            "moduleVersion": "2.24.3",
+            "moduleVersion": "2.24.1",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -764,7 +764,7 @@
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.34",
+            "moduleVersion": "10.1.33",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -880,182 +880,182 @@
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-annotations",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-plus",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlet",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlets",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-webapp",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-api",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-alpn-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-ee",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-http",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-io",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-plus",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-security",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-session",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-util",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-xml",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.16",
+            "moduleVersion": "12.0.15",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
@@ -1097,7 +1097,7 @@
         {
             "moduleName": "org.hibernate.orm:hibernate-core",
             "moduleUrl": "https://www.hibernate.org/orm/6.6",
-            "moduleVersion": "6.6.4.Final",
+            "moduleVersion": "6.6.2.Final",
             "moduleLicense": "GNU Library General Public License v2.1 or later",
             "moduleLicenseUrl": "https://www.opensource.org/licenses/LGPL-2.1"
         },
@@ -1273,168 +1273,168 @@
         {
             "moduleName": "org.springframework.boot:spring-boot",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-devtools",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jdbc",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jetty",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-json",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-logging",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-security",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-web",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-commons",
             "moduleUrl": "https://spring.io/projects/spring-data",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-jpa",
             "moduleUrl": "https://projects.spring.io/spring-data-jpa",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-config",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-crypto",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-jose",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -1448,91 +1448,91 @@
         {
             "moduleName": "org.springframework.security:spring-security-web",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.2",
+            "moduleVersion": "6.4.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.session:spring-session-core",
             "moduleUrl": "https://spring.io/projects/spring-session",
-            "moduleVersion": "3.4.1",
+            "moduleVersion": "3.4.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aop",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aspects",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-beans",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-context",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-core",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-expression",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jcl",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jdbc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-orm",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-tx",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-web",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.1",
+            "moduleVersion": "6.2.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -1551,7 +1551,7 @@
         },
         {
             "moduleName": "org.thymeleaf:thymeleaf",
-            "moduleVersion": "3.1.3.RELEASE",
+            "moduleVersion": "3.1.2.RELEASE",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -1563,7 +1563,7 @@
         },
         {
             "moduleName": "org.thymeleaf:thymeleaf-spring6",
-            "moduleVersion": "3.1.3.RELEASE",
+            "moduleVersion": "3.1.2.RELEASE",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },

src/main/resources/static/css/add-image.css

@@ -2,32 +2,22 @@
   position: relative;
   margin: 20px 0;
 }
-
 #pdf-canvas {
   box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
   width: 100%;
 }
-
 .draggable-buttons-box {
-  position: relative;
+  position: absolute;
   top: 0;
   padding: 10px;
-  width: calc(100% + 4.4rem);
+  width: 100%;
   display: flex;
   gap: 5px;
-  z-index: 5;
-  margin-left: -2.2rem;
 }
-
+.draggable-buttons-box > button {
-.draggable-buttons-box>button {
+  z-index: 10;
-  z-index: 4;
   background-color: rgba(13, 110, 253, 0.1);
-  flex: 1 1 auto;
-  min-width: 2.5rem;
-  max-width: 4rem;
 }
-
-
 .draggable-canvas {
   border: 1px solid red;
   position: absolute;
@@ -36,20 +26,3 @@
   top: 0px;
   left: 0;
 }
-
-.input-with-icon {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-}
-
-.input-with-icon .icon {
-  position: absolute;
-  left: 0.5rem;
-  pointer-events: none;
-  color: #aaa;
-}
-
-.input-with-icon input {
-  padding-left: 2.2rem;
-}

src/main/resources/static/css/fileSelect.css

@@ -118,7 +118,6 @@
   row-gap: 1px;
   height: 60px;
   width: 60px;
-  top:4px;
 }
 
 .file-icon {
@@ -166,8 +165,8 @@
   height: 15px;
   width: 15px;
 
-  right: 0px;
+  right: 10px;
-  top: -17px;
+  top: -5px;
 }
 
 .remove-selected-file * {
@@ -220,54 +219,3 @@
   border-radius: 1rem;
   border: 1px solid rgb(105, 116, 134, 0.5);
 }
-
-.draggable-image-overlay{
-  position: absolute;
-  background: rgba(0, 0, 0, 0.7);
-  display: none;
-  z-index: 10;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  font-size: 16px;
-  font-weight: bold;
-  pointer-events: none;
-  left:0;
-  top:0;
-  height:100%;
-  width:100%;
-  border-radius: 1rem;
-}
-
-.small-file-container:hover .drag-icon {
-  display: flex;
-}
-
-.drag-icon {
-  display: none;
-  position: absolute;
-  top: 5px;
-  width: 20px;
-  height: 20px;
-  background: rgba(0, 0, 0, 0.5);
-  color: white;
-  align-items: center;
-  justify-content: center;
-  border-radius: 50%;
-  font-size: 14px;
-  pointer-events: none;
-  z-index: 1;
-}
-
-#imagePreviewModal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: none;
-  justify-content: center;
-  align-items: center;
-  z-index: 9999;
-}

src/main/resources/static/css/sign.css

@@ -22,38 +22,18 @@ select#font-select option {
 }
 
 .draggable-buttons-box {
-  position: relative;
+  position: absolute;
   top: 0;
   padding: 10px;
-  width: calc(100% + 4.4rem);
+  width: 100%;
   display: flex;
   gap: 5px;
   z-index: 5;
-  margin-left: -2.2rem;
 }
 
 .draggable-buttons-box>button {
   z-index: 4;
   background-color: rgba(13, 110, 253, 0.1);
-  flex: 1 1 auto;
-  min-width: 2.5rem;
-  max-width: 4rem;
-}
-
-
-.rotation-handle {
-  width: 20px;
-  height: 20px;
-  border: 2px solid #3498db;
-  background-color: rgba(52, 152, 219, 0.1);
-  color: white;
-  border-radius: 50%;
-  text-align: center;
-  line-height: 20px;
-  position: absolute;
-  cursor: grab;
-  top: -30px;
-  left: calc(50% - 10px);
 }
 
 .draggable-canvas {
@@ -133,33 +113,3 @@ select#font-select option {
   text-align: right;
   padding: 0.5rem 1rem;
 }
-
-.input-with-icon {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-}
-
-.input-with-icon .icon {
-  position: absolute;
-  left: 0.5rem;
-  pointer-events: none;
-  color: #aaa;
-}
-
-.input-with-icon input {
-  padding-left: 2.2rem;
-}
-
-.small-file-container-saved {
-  padding-top: 1px;
-  position: relative;
-  row-gap: 1px;
-  height: 60px;
-  width: 60px;
-  top: 4px;
-}
-
-.small-file-container-saved:hover .drag-icon {
-  display: flex;
-}

src/main/resources/static/js/draggable-utils.js

@@ -7,137 +7,75 @@ const DraggableUtils = {
   elementAllPages: [],
   documentsMap: new Map(),
   lastInteracted: null,
-  padding: 15,
+
-  maintainRatioEnabled: true,
   init() {
     interact('.draggable-canvas')
       .draggable({
         listeners: {
-          start(event) {
-            const target = event.target;
-            x = parseFloat(target.getAttribute('data-bs-x'));
-            y = parseFloat(target.getAttribute('data-bs-y'));
-          },
           move: (event) => {
             const target = event.target;
+            const x = (parseFloat(target.getAttribute('data-bs-x')) || 0) + event.dx;
+            const y = (parseFloat(target.getAttribute('data-bs-y')) || 0) + event.dy;
 
-            // Retrieve position attributes
-            let x = parseFloat(target.getAttribute('data-bs-x')) || 0;
-            let y = parseFloat(target.getAttribute('data-bs-y')) || 0;
-            const angle = parseFloat(target.getAttribute('data-angle')) || 0;
-
-            // Update position based on drag movement
-            x += event.dx;
-            y += event.dy;
-
-            // Apply translation to the parent container (bounding box)
             target.style.transform = `translate(${x}px, ${y}px)`;
-
-            // Preserve rotation on the inner canvas
-            const canvas = target.querySelector('.display-canvas');
-
-            const canvasWidth = parseFloat(canvas.style.width);
-            const canvasHeight = parseFloat(canvas.style.height);
-
-            const cosAngle = Math.abs(Math.cos(angle));
-            const sinAngle = Math.abs(Math.sin(angle));
-
-            const rotatedWidth = canvasWidth * cosAngle + canvasHeight * sinAngle;
-            const rotatedHeight = canvasWidth * sinAngle + canvasHeight * cosAngle;
-
-            const offsetX = (rotatedWidth - canvasWidth) / 2;
-            const offsetY = (rotatedHeight - canvasHeight) / 2;
-
-            canvas.style.transform = `translate(${offsetX}px, ${offsetY}px) rotate(${angle}rad)`;
-
-            // Update attributes for persistence
             target.setAttribute('data-bs-x', x);
             target.setAttribute('data-bs-y', y);
 
-            // Set the last interacted element
+            this.onInteraction(target);
-            this.lastInteracted = target;
+            //update the last interacted element
+            this.lastInteracted = event.target;
           },
         },
       })
       .resizable({
-        edges: { left: true, right: true, bottom: true, top: true },
+        edges: {left: true, right: true, bottom: true, top: true},
         listeners: {
-          start: (event) => {
-            const target = event.target;
-            x = parseFloat(target.getAttribute('data-bs-x')) || 0;
-            y = parseFloat(target.getAttribute('data-bs-y')) || 0;
-          },
           move: (event) => {
-            const target = event.target;
+            var target = event.target;
+            var x = parseFloat(target.getAttribute('data-bs-x')) || 0;
+            var y = parseFloat(target.getAttribute('data-bs-y')) || 0;
 
-            const MAX_CHANGE = 60;
+            // check if control key is pressed
+            if (event.ctrlKey) {
+              const aspectRatio = target.offsetWidth / target.offsetHeight;
+              // preserve aspect ratio
+              let width = event.rect.width;
+              let height = event.rect.height;
 
-            let width = event.rect.width - 2 * this.padding;
+              if (Math.abs(event.deltaRect.width) >= Math.abs(event.deltaRect.height)) {
-            let height = event.rect.height - 2 * this.padding;
+                height = width / aspectRatio;
-
+              } else {
-            const canvas = target.querySelector('.display-canvas');
+                width = height * aspectRatio;
-            if (canvas) {
-              const originalWidth = parseFloat(canvas.style.width) || canvas.width;
-              const originalHeight = parseFloat(canvas.style.height) || canvas.height;
-              const angle = parseFloat(target.getAttribute('data-angle')) || 0;
-
-              const aspectRatio = originalWidth / originalHeight;
-
-              if (!event.ctrlKey && this.maintainRatioEnabled) {
-                if (Math.abs(event.deltaRect.width) >= Math.abs(event.deltaRect.height)) {
-                  height = width / aspectRatio;
-                } else {
-                  width = height * aspectRatio;
-                }
               }
 
-              const widthChange = width - originalWidth;
+              event.rect.width = width;
-              const heightChange = height - originalHeight;
+              event.rect.height = height;
-
-              if (Math.abs(widthChange) > MAX_CHANGE || Math.abs(heightChange) > MAX_CHANGE) {
-                const scale = MAX_CHANGE / Math.max(Math.abs(widthChange), Math.abs(heightChange));
-                width = originalWidth + widthChange * scale;
-                height = originalHeight + heightChange * scale;
-              }
-
-              const cosAngle = Math.abs(Math.cos(angle));
-              const sinAngle = Math.abs(Math.sin(angle));
-              const boundingWidth = width * cosAngle + height * sinAngle;
-              const boundingHeight = width * sinAngle + height * cosAngle;
-
-              if (event.edges.left) {
-                const dx = event.deltaRect.left;
-                x += dx;
-              }
-              if (event.edges.top) {
-                const dy = event.deltaRect.top;
-                y += dy;
-              }
-
-              target.style.transform = `translate(${x}px, ${y}px)`;
-              target.style.width = `${boundingWidth + 2 * this.padding}px`;
-              target.style.height = `${boundingHeight + 2 * this.padding}px`;
-
-              canvas.style.width = `${width}px`;
-              canvas.style.height = `${height}px`;
-              canvas.style.transform = `translate(${(boundingWidth - width) / 2}px, ${(boundingHeight - height) / 2
-                }px) rotate(${angle}rad)`;
-
-              target.setAttribute('data-bs-x', x);
-              target.setAttribute('data-bs-y', y);
-
-              this.lastInteracted = target;
             }
+
+            target.style.width = event.rect.width + 'px';
+            target.style.height = event.rect.height + 'px';
+
+            // translate when resizing from top or left edges
+            x += event.deltaRect.left;
+            y += event.deltaRect.top;
+
+            target.style.transform = 'translate(' + x + 'px,' + y + 'px)';
+
+            target.setAttribute('data-bs-x', x);
+            target.setAttribute('data-bs-y', y);
+            target.textContent = Math.round(event.rect.width) + '\u00D7' + Math.round(event.rect.height);
+
+            this.onInteraction(target);
           },
         },
+
         modifiers: [
           interact.modifiers.restrictSize({
-            min: { width: 50, height: 50 },
+            min: {width: 5, height: 5},
           }),
         ],
         inertia: true,
       });
-
     //Arrow key Support for Add-Image and Sign pages
     if (window.location.pathname.endsWith('sign') || window.location.pathname.endsWith('add-image')) {
       window.addEventListener('keydown', (event) => {
@@ -179,8 +117,7 @@ const DraggableUtils = {
         }
 
         // Update position
-        const angle = parseFloat(target.getAttribute('data-angle')) || 0;
+        target.style.transform = `translate(${x}px, ${y}px)`;
-        target.style.transform = `translate(${x}px, ${y}px) rotate(${angle}rad)`;
         target.setAttribute('data-bs-x', x);
         target.setAttribute('data-bs-y', y);
 
@@ -188,97 +125,72 @@ const DraggableUtils = {
       });
     }
   },
+
   onInteraction(target) {
-    this.lastInteracted = target;
+    this.boxDragContainer.appendChild(target);
-    // this.boxDragContainer.appendChild(target);
+  },
-    // target.appendChild(target.querySelector(".display-canvas"));
+
+  createDraggableCanvas() {
+    const createdCanvas = document.createElement('canvas');
+    createdCanvas.id = `draggable-canvas-${this.nextId++}`;
+    createdCanvas.classList.add('draggable-canvas');
+
+    const x = 0;
+    const y = 20;
+    createdCanvas.style.transform = `translate(${x}px, ${y}px)`;
+    createdCanvas.setAttribute('data-bs-x', x);
+    createdCanvas.setAttribute('data-bs-y', y);
+
+    //Click element in order to enable arrow keys
+    createdCanvas.addEventListener('click', () => {
+      this.lastInteracted = createdCanvas;
+    });
+
+    createdCanvas.onclick = (e) => this.onInteraction(e.target);
+
+    this.boxDragContainer.appendChild(createdCanvas);
+
+    //Enable Arrow keys directly after the element is created
+    this.lastInteracted = createdCanvas;
+
+    return createdCanvas;
   },
   createDraggableCanvasFromUrl(dataUrl) {
     return new Promise((resolve) => {
-      const canvasContainer = document.createElement('div');
+      var myImage = new Image();
-      const createdCanvas = document.createElement('canvas'); // Inner canvas
-      const padding = this.padding;
-
-      canvasContainer.id = `draggable-canvas-${this.nextId++}`;
-      canvasContainer.classList.add('draggable-canvas');
-      createdCanvas.classList.add('display-canvas');
-
-      canvasContainer.style.position = 'absolute';
-      canvasContainer.style.padding = `${padding}px`;
-      canvasContainer.style.overflow = 'hidden';
-
-      let x = 0,
-        y = 30,
-        angle = 0;
-      canvasContainer.style.transform = `translate(${x}px, ${y}px)`;
-      canvasContainer.setAttribute('data-bs-x', x);
-      canvasContainer.setAttribute('data-bs-y', y);
-      canvasContainer.setAttribute('data-angle', angle);
-
-      canvasContainer.addEventListener('click', () => {
-        this.lastInteracted = canvasContainer;
-        this.showRotationControls(canvasContainer);
-      });
-      canvasContainer.appendChild(createdCanvas);
-      this.boxDragContainer.appendChild(canvasContainer);
-
-      const myImage = new Image();
       myImage.src = dataUrl;
       myImage.onload = () => {
-        const context = createdCanvas.getContext('2d');
+        var createdCanvas = this.createDraggableCanvas();
 
         createdCanvas.width = myImage.width;
         createdCanvas.height = myImage.height;
 
         const imgAspect = myImage.width / myImage.height;
-        const containerWidth = this.boxDragContainer.offsetWidth;
+        const pdfAspect = this.boxDragContainer.offsetWidth / this.boxDragContainer.offsetHeight;
-        const containerHeight = this.boxDragContainer.offsetHeight;
 
-        let scaleMultiplier = Math.min(containerWidth / myImage.width, containerHeight / myImage.height);
+        var scaleMultiplier;
-        const scaleFactor = 0.5;
+        if (imgAspect > pdfAspect) {
+          scaleMultiplier = this.boxDragContainer.offsetWidth / myImage.width;
+        } else {
+          scaleMultiplier = this.boxDragContainer.offsetHeight / myImage.height;
+        }
 
-        const newWidth = myImage.width * scaleMultiplier * scaleFactor;
+        var newWidth = createdCanvas.width;
-        const newHeight = myImage.height * scaleMultiplier * scaleFactor;
+        var newHeight = createdCanvas.height;
+        if (scaleMultiplier < 1) {
+          newWidth = newWidth * scaleMultiplier;
+          newHeight = newHeight * scaleMultiplier;
+        }
 
-        // Calculate initial bounding box size
+        createdCanvas.style.width = newWidth + 'px';
-        const cosAngle = Math.abs(Math.cos(angle));
+        createdCanvas.style.height = newHeight + 'px';
-        const sinAngle = Math.abs(Math.sin(angle));
-        const boundingWidth = newWidth * cosAngle + newHeight * sinAngle;
-        const boundingHeight = newWidth * sinAngle + newHeight * cosAngle;
 
-        createdCanvas.style.width = `${newWidth}px`;
+        var myContext = createdCanvas.getContext('2d');
-        createdCanvas.style.height = `${newHeight}px`;
+        myContext.drawImage(myImage, 0, 0);
-
+        resolve(createdCanvas);
-        canvasContainer.style.width = `${boundingWidth + 2 * padding}px`;
-        canvasContainer.style.height = `${boundingHeight + 2 * padding}px`;
-
-        context.imageSmoothingEnabled = true;
-        context.imageSmoothingQuality = 'high';
-        context.drawImage(myImage, 0, 0, myImage.width, myImage.height);
-        this.showRotationControls(canvasContainer);
-        this.lastInteracted = canvasContainer;
-
-        resolve(canvasContainer);
-      };
-
-      myImage.onerror = () => {
-        console.error('Failed to load the image.');
-        resolve(null);
       };
     });
   },
-  toggleMaintainRatio() {
-    this.maintainRatioEnabled = !this.maintainRatioEnabled;
-    const button = document.getElementById('ratioToggleBtn');
-    if (this.maintainRatioEnabled) {
-      button.classList.remove('btn-danger');
-      button.classList.add('btn-outline-secondary');
-    } else {
-      button.classList.remove('btn-outline-secondary');
-      button.classList.add('btn-danger');
-    }
-  },
-
   deleteAllDraggableCanvases() {
     this.boxDragContainer.querySelectorAll('.draggable-canvas').forEach((el) => el.remove());
   },
@@ -354,61 +266,9 @@ const DraggableUtils = {
     }
   },
   getLastInteracted() {
-    return this.lastInteracted;
+    return this.boxDragContainer.querySelector('.draggable-canvas:last-of-type');
   },
-  showRotationControls(element) {
-    const rotationControls = document.getElementById('rotation-controls');
-    const rotationInput = document.getElementById('rotation-input');
-    rotationControls.style.display = 'flex';
-    rotationInput.value = Math.round((parseFloat(element.getAttribute('data-angle')) * 180) / Math.PI);
-    rotationInput.addEventListener('input', this.handleRotationInputChange);
-  },
-  hideRotationControls() {
-    const rotationControls = document.getElementById('rotation-controls');
-    const rotationInput = document.getElementById('rotation-input');
-    rotationControls.style.display = 'none';
-    rotationInput.addEventListener('input', this.handleRotationInputChange);
-  },
-  applyRotationToElement(element, degrees) {
-    const radians = degrees * (Math.PI / 180); // Convert degrees to radians
 
-    // Get current position
-    const x = parseFloat(element.getAttribute('data-bs-x')) || 0;
-    const y = parseFloat(element.getAttribute('data-bs-y')) || 0;
-
-    // Get the inner canvas (image)
-    const canvas = element.querySelector('.display-canvas');
-    if (canvas) {
-      const originalWidth = parseFloat(canvas.style.width);
-      const originalHeight = parseFloat(canvas.style.height);
-      const padding = this.padding; // Access the padding value
-
-      // Calculate rotated bounding box dimensions
-      const cosAngle = Math.abs(Math.cos(radians));
-      const sinAngle = Math.abs(Math.sin(radians));
-      const boundingWidth = originalWidth * cosAngle + originalHeight * sinAngle + 2 * padding;
-      const boundingHeight = originalWidth * sinAngle + originalHeight * cosAngle + 2 * padding;
-
-      // Update parent container to fit the rotated bounding box
-      element.style.width = `${boundingWidth}px`;
-      element.style.height = `${boundingHeight}px`;
-
-      // Center the canvas within the bounding box, accounting for padding
-      const offsetX = (boundingWidth - originalWidth) / 2 - padding;
-      const offsetY = (boundingHeight - originalHeight) / 2 - padding;
-
-      canvas.style.transform = `translate(${offsetX}px, ${offsetY}px) rotate(${radians}rad)`;
-    }
-
-    // Keep the bounding box positioned properly
-    element.style.transform = `translate(${x}px, ${y}px)`;
-    element.setAttribute('data-angle', radians);
-  },
-  handleRotationInputChange() {
-    const rotationInput = document.getElementById('rotation-input');
-    const degrees = parseFloat(rotationInput.value) || 0;
-    DraggableUtils.applyRotationToElement(DraggableUtils.lastInteracted, degrees);
-  },
   storePageContents() {
     var pagesMap = this.documentsMap.get(this.pdfDoc);
     if (!pagesMap) {
@@ -465,7 +325,7 @@ const DraggableUtils = {
     // render the page onto the canvas
     var renderContext = {
       canvasContext: this.pdfCanvas.getContext('2d'),
-      viewport: page.getViewport({ scale: 1 }),
+      viewport: page.getViewport({scale: 1}),
     };
     await page.render(renderContext).promise;
 
@@ -492,6 +352,8 @@ const DraggableUtils = {
       this.loadPageContents();
     }
   },
+
+  parseTransform(element) {},
   async getOverlayedPdfDocument() {
     const pdfBytes = await this.pdfDoc.getData();
     const pdfDocModified = await PDFLib.PDFDocument.load(pdfBytes, {
@@ -505,6 +367,7 @@ const DraggableUtils = {
       if (pageIdx.includes('offset')) {
         continue;
       }
+      console.log(typeof pageIdx);
 
       const page = pdfDocModified.getPage(parseInt(pageIdx));
       let draggablesData = pagesMap[pageIdx];
@@ -513,61 +376,45 @@ const DraggableUtils = {
       const offsetHeight = pagesMap[pageIdx + '-offsetHeight'];
 
       for (const draggableData of draggablesData) {
-        // Embed the draggable canvas
+        // embed the draggable canvas
-        const draggableElement = draggableData.element.querySelector('.display-canvas');
+        const draggableElement = draggableData.element;
         const response = await fetch(draggableElement.toDataURL());
         const draggableImgBytes = await response.arrayBuffer();
         const pdfImageObject = await pdfDocModified.embedPng(draggableImgBytes);
 
-        // Extract transformation data
+        // calculate the position in the pdf document
-        const transform = draggableData.element.style.transform || '';
+        const tansform = draggableElement.style.transform.replace(/[^.,-\d]/g, '');
-        const translateRegex = /translate\((-?\d+(?:\.\d+)?)px,\s*(-?\d+(?:\.\d+)?)px\)/;
+        const transformComponents = tansform.split(',');
-
-        const translateMatch = transform.match(translateRegex);
-
-        const translateX = translateMatch ? parseFloat(translateMatch[1]) : 0;
-        const translateY = translateMatch ? parseFloat(translateMatch[2]) : 0;
-
-        const childTransform = draggableElement.style.transform || '';
-        const childTranslateMatch = childTransform.match(translateRegex);
-
-        const childOffsetX = childTranslateMatch ? parseFloat(childTranslateMatch[1]) : 0;
-        const childOffsetY = childTranslateMatch ? parseFloat(childTranslateMatch[2]) : 0;
-
-        const rotateAngle = parseFloat(draggableData.element.getAttribute('data-angle')) || 0;
-
         const draggablePositionPixels = {
-          x: translateX + childOffsetX + this.padding + 2,
+          x: parseFloat(transformComponents[0]),
-          y: translateY + childOffsetY + this.padding + 2,
+          y: parseFloat(transformComponents[1]),
-          width: parseFloat(draggableElement.style.width),
+          width: draggableData.offsetWidth,
-          height: parseFloat(draggableElement.style.height),
+          height: draggableData.offsetHeight,
-          angle: rotateAngle, // Store rotation
         };
 
-        // Auxiliary variables
+        //Auxiliary variables
         let widthAdjusted = page.getWidth();
         let heightAdjusted = page.getHeight();
         const rotation = page.getRotation();
 
-        // Normalize page rotation angle
+        //Normalizing angle
         let normalizedAngle = rotation.angle % 360;
         if (normalizedAngle < 0) {
           normalizedAngle += 360;
         }
 
-        // Adjust page dimensions for rotated pages
+        //Changing the page dimension if the angle is 90 or 270
         if (normalizedAngle === 90 || normalizedAngle === 270) {
-          [widthAdjusted, heightAdjusted] = [heightAdjusted, widthAdjusted];
+          let widthTemp = widthAdjusted;
+          widthAdjusted = heightAdjusted;
+          heightAdjusted = widthTemp;
         }
-
         const draggablePositionRelative = {
           x: draggablePositionPixels.x / offsetWidth,
           y: draggablePositionPixels.y / offsetHeight,
           width: draggablePositionPixels.width / offsetWidth,
           height: draggablePositionPixels.height / offsetHeight,
-          angle: draggablePositionPixels.angle,
         };
-
         const draggablePositionPdf = {
           x: draggablePositionRelative.x * widthAdjusted,
           y: draggablePositionRelative.y * heightAdjusted,
@@ -575,13 +422,11 @@ const DraggableUtils = {
           height: draggablePositionRelative.height * heightAdjusted,
         };
 
-        // Calculate position based on normalized page rotation
+        //Defining the image if the page has a 0-degree angle
         let x = draggablePositionPdf.x;
         let y = heightAdjusted - draggablePositionPdf.y - draggablePositionPdf.height;
 
-        let originx = x + draggablePositionPdf.width / 2;
+        //Defining the image position if it is at other angles
-        let originy = heightAdjusted - draggablePositionPdf.y - draggablePositionPdf.height / 2;
-
         if (normalizedAngle === 90) {
           x = draggablePositionPdf.y + draggablePositionPdf.height;
           y = draggablePositionPdf.x;
@@ -592,32 +437,17 @@ const DraggableUtils = {
           x = heightAdjusted - draggablePositionPdf.y - draggablePositionPdf.height;
           y = widthAdjusted - draggablePositionPdf.x;
         }
-        // let angle = draggablePositionPixels.angle % 360;
+
-        // if (angle < 0) angle += 360; // Normalize to positive angle
+        // draw the image
-        const radians = -draggablePositionPixels.angle; // Convert angle to radians
-        page.pushOperators(
-          PDFLib.pushGraphicsState(),
-          PDFLib.concatTransformationMatrix(1, 0, 0, 1, originx, originy),
-          PDFLib.concatTransformationMatrix(
-            Math.cos(radians),
-            Math.sin(radians),
-            -Math.sin(radians),
-            Math.cos(radians),
-            0,
-            0
-          ),
-          PDFLib.concatTransformationMatrix(1, 0, 0, 1, -1 * originx, -1 * originy)
-        );
         page.drawImage(pdfImageObject, {
           x: x,
           y: y,
           width: draggablePositionPdf.width,
           height: draggablePositionPdf.height,
+          rotate: rotation,
         });
-        page.pushOperators(PDFLib.popGraphicsState());
       }
     }
-
     this.loadPageContents();
     return pdfDocModified;
   },

src/main/resources/static/js/fileInput.js

@@ -9,7 +9,6 @@ if (!isScriptExecuted) {
     document.querySelectorAll('.custom-file-chooser').forEach(setupFileInput);
   });
 }
-let hasDroppedImage = false;
 
 function setupFileInput(chooser) {
   const elementId = chooser.getAttribute('data-bs-element-id');
@@ -19,11 +18,6 @@ function setupFileInput(chooser) {
 
   let inputContainer = document.getElementById(inputContainerId);
 
-  if (inputContainer.id === 'pdf-upload-input-container') {
-    inputContainer.querySelector('#dragAndDrop').innerHTML = window.fileInput.dragAndDropPDF;
-  } else if (inputContainer.id === 'image-upload-input-container') {
-    inputContainer.querySelector('#dragAndDrop').innerHTML = window.fileInput.dragAndDropImage;
-  }
   let allFiles = [];
   let overlay;
   let dragCounter = 0;
@@ -147,17 +141,12 @@ function setupFileInput(chooser) {
     files.forEach((file) => dataTransfer.items.add(file));
     return dataTransfer;
   }
+
   function handleFileInputChange(inputElement) {
     const files = allFiles;
     showOrHideSelectedFilesContainer(files);
 
-    const filesInfo = files.map((f) => ({
+    const filesInfo = files.map((f) => ({name: f.name, size: f.size, uniqueId: f.uniqueId}));
-      name: f.name,
-      size: f.size,
-      uniqueId: f.uniqueId,
-      type: f.type,
-      url: URL.createObjectURL(f),
-    }));
 
     const selectedFilesContainer = $(inputContainer).siblings('.selected-files');
     selectedFilesContainer.empty();
@@ -168,111 +157,30 @@ function setupFileInput(chooser) {
       $(fileContainer).addClass(fileContainerClasses);
       $(fileContainer).attr('id', info.uniqueId);
 
-      let fileIconContainer = document.createElement('div');
+      let fileIconContainer = createFileIconContainer(info);
-      const isDragAndDropEnabled =
-        window.location.pathname.includes('add-image') || window.location.pathname.includes('sign');
-      if (info.type.startsWith('image/')) {
-        let imgPreview = document.createElement('img');
-        imgPreview.src = info.url;
-        imgPreview.alt = 'Preview';
-        imgPreview.style.width = '50px';
-        imgPreview.style.height = '50px';
-        imgPreview.style.objectFit = 'cover';
-        $(fileIconContainer).append(imgPreview);
-
-        if (isDragAndDropEnabled) {
-          let dragIcon = document.createElement('div');
-          dragIcon.classList.add('drag-icon');
-          dragIcon.innerHTML =
-            '<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M360-160q-33 0-56.5-23.5T280-240q0-33 23.5-56.5T360-320q33 0 56.5 23.5T440-240q0 33-23.5 56.5T360-160Zm240 0q-33 0-56.5-23.5T520-240q0-33 23.5-56.5T600-320q33 0 56.5 23.5T680-240q0 33-23.5 56.5T600-160ZM360-400q-33 0-56.5-23.5T280-480q0-33 23.5-56.5T360-560q33 0 56.5 23.5T440-480q0 33-23.5 56.5T360-400Zm240 0q-33 0-56.5-23.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 33-23.5 56.5T600-400ZM360-640q-33 0-56.5-23.5T280-720q0-33 23.5-56.5T360-800q33 0 56.5 23.5T440-720q0 33-23.5 56.5T360-640Zm240 0q-33 0-56.5-23.5T520-720q0-33 23.5-56.5T600-800q33 0 56.5 23.5T680-720q0 33-23.5 56.5T600-640Z"/></svg>';
-          fileContainer.appendChild(dragIcon);
-
-          $(fileContainer).attr('draggable', 'true');
-          $(fileContainer).on('dragstart', (e) => {
-            e.originalEvent.dataTransfer.setData('fileUrl', info.url);
-            e.originalEvent.dataTransfer.setData('uniqueId', info.uniqueId);
-            e.originalEvent.dataTransfer.setDragImage(imgPreview, imgPreview.width / 2, imgPreview.height / 2);
-          });
-          enableImagePreviewOnClick(fileIconContainer);
-        } else {
-          $(fileContainer).removeAttr('draggable');
-        }
-      } else {
-        fileIconContainer = createFileIconContainer(info);
-      }
 
       let fileInfoContainer = createFileInfoContainer(info);
 
-      if (!isDragAndDropEnabled) {
+      let removeBtn = document.createElement('div');
-        let removeBtn = document.createElement('div');
+      removeBtn.classList.add('remove-selected-file');
-        removeBtn.classList.add('remove-selected-file');
 
-        let removeBtnIconHTML = `<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#C02223"><path d="m339-288 141-141 141 141 51-51-141-141 141-141-51-51-141 141-141-141-51 51 141 141-141 141 51 51ZM480-96q-79 0-149-30t-122.5-82.5Q156-261 126-331T96-480q0-80 30-149.5t82.5-122Q261-804 331-834t149-30q80 0 149.5 30t122 82.5Q804-699 834-629.5T864-480q0 79-30 149t-82.5 122.5Q699-156 629.5-126T480-96Z"/></svg>`;
+      let removeBtnIconHTML = `<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#C02223"><path d="m339-288 141-141 141 141 51-51-141-141 141-141-51-51-141 141-141-141-51 51 141 141-141 141 51 51ZM480-96q-79 0-149-30t-122.5-82.5Q156-261 126-331T96-480q0-80 30-149.5t82.5-122Q261-804 331-834t149-30q80 0 149.5 30t122 82.5Q804-699 834-629.5T864-480q0 79-30 149t-82.5 122.5Q699-156 629.5-126T480-96Z"/></svg>`;
-        $(removeBtn).append(removeBtnIconHTML);
+      $(removeBtn).append(removeBtnIconHTML);
-        $(removeBtn).attr('data-file-id', info.uniqueId).click(removeFileListener);
+      $(removeBtn).attr('data-file-id', info.uniqueId).click(removeFileListener);
-        $(fileContainer).append(removeBtn);
+
-      }
+      $(fileContainer).append(fileIconContainer);
-      $(fileContainer).append(fileIconContainer, fileInfoContainer);
+      $(fileContainer).append(fileInfoContainer);
+      $(fileContainer).append(removeBtn);
 
       selectedFilesContainer.append(fileContainer);
     });
-    const pageContainers = $('#box-drag-container');
-    pageContainers.off('dragover').on('dragover', (e) => {
-      e.preventDefault();
-    });
 
-    pageContainers.off('drop').on('drop', (e) => {
+    showOrHideSelectedFilesContainer(filesInfo);
-      e.preventDefault();
-      const fileUrl = e.originalEvent.dataTransfer.getData('fileUrl');
-
-      if (fileUrl) {
-        const existingImages = $(e.target).find(`img[src="${fileUrl}"]`);
-        if (existingImages.length === 0) {
-          DraggableUtils.createDraggableCanvasFromUrl(fileUrl);
-        }
-      }
-      const overlayElement = chooser.querySelector('.drag-drop-overlay');
-      if (overlayElement) {
-        overlayElement.style.display = 'none';
-      }
-      hasDroppedImage = true;
-    });
-
-    showOrHideSelectedFilesContainer(files);
   }
 
   function showOrHideSelectedFilesContainer(files) {
-    if (files && files.length > 0) {
+    if (files && files.length > 0) chooser.style.setProperty('--selected-files-display', 'flex');
-      chooser.style.setProperty('--selected-files-display', 'flex');
+    else chooser.style.setProperty('--selected-files-display', 'none');
-    } else {
-      chooser.style.setProperty('--selected-files-display', 'none');
-    }
-    const isDragAndDropEnabled =
-      (window.location.pathname.includes('add-image') || window.location.pathname.includes('sign')) &&
-      files.some((file) => file.type.startsWith('image/'));
-
-    if (!isDragAndDropEnabled) return;
-
-    const selectedFilesContainer = chooser.querySelector('.selected-files');
-
-    let overlayElement = chooser.querySelector('.drag-drop-overlay');
-    if (!overlayElement) {
-      selectedFilesContainer.style.position = 'relative';
-      overlayElement = document.createElement('div');
-      overlayElement.classList.add('draggable-image-overlay');
-
-      overlayElement.innerHTML = 'Drag images to add them to the page';
-      selectedFilesContainer.appendChild(overlayElement);
-    }
-    if (hasDroppedImage) overlayElement.style.display = files && files.length > 0 ? 'flex' : 'none';
-
-    selectedFilesContainer.addEventListener('mouseenter', () => {
-      overlayElement.style.display = 'none';
-    });
-
-    selectedFilesContainer.addEventListener('mouseleave', () => {
-      if (!hasDroppedImage) overlayElement.style.display = files && files.length > 0 ? 'flex' : 'none';
-    });
   }
 
   function removeFileListener(e) {
@@ -327,52 +235,4 @@ function setupFileInput(chooser) {
     removeFileById(fileId, inputElement);
     showOrHideSelectedFilesContainer(allFiles);
   });
-  function enableImagePreviewOnClick(container) {
-    const imagePreviewModal = document.getElementById('imagePreviewModal') || createImagePreviewModal();
-
-    container.querySelectorAll('img').forEach((img) => {
-      if (!img.hasPreviewListener) {
-        img.addEventListener('mouseup', function () {
-          const imgElement = imagePreviewModal.querySelector('img');
-          imgElement.src = this.src;
-          imagePreviewModal.style.display = 'flex';
-        });
-        img.hasPreviewListener = true;
-      }
-    });
-
-    function createImagePreviewModal() {
-      const modal = document.createElement('div');
-      modal.id = 'imagePreviewModal';
-      modal.style.position = 'fixed';
-      modal.style.top = '0';
-      modal.style.left = '0';
-      modal.style.width = '100vw';
-      modal.style.height = '100vh';
-      modal.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-      modal.style.display = 'none';
-      modal.style.justifyContent = 'center';
-      modal.style.alignItems = 'center';
-      modal.style.zIndex = '2000';
-
-      const imgElement = document.createElement('img');
-      imgElement.style.maxWidth = '90%';
-      imgElement.style.maxHeight = '90%';
-
-      modal.appendChild(imgElement);
-      document.body.appendChild(modal);
-
-      modal.addEventListener('click', () => {
-        modal.style.display = 'none';
-      });
-
-      document.addEventListener('keydown', (e) => {
-        if (e.key === 'Escape' && modal.style.display === 'flex') {
-          modal.style.display = 'none';
-        }
-      });
-
-      return modal;
-    }
-  }
 }

src/main/resources/static/js/multitool/PdfContainer.js

@@ -168,21 +168,6 @@ class PdfContainer {
       input.click();
     });
   }
-
-  async handleDroppedFiles(files, nextSiblingElement = null) {
-    if (files.length > 0) {
-      const pages = await this.addFilesFromFiles(files, nextSiblingElement, []);
-      this.updateFilename(files[0]?.name || 'untitled');
-
-      const selectAll = document.getElementById('select-pages-container');
-      if (selectAll) {
-        selectAll.classList.remove('hidden');
-      }
-
-      return pages;
-    }
-  }
-
   async addFilesFromFiles(files, nextSiblingElement, pages) {
     this.fileName = files[0].name;
     for (var i = 0; i < files.length; i++) {

src/main/resources/static/js/multitool/fileInput.js

@@ -8,7 +8,7 @@ class FileDragManager {
     this.setCallback(cb);
 
     // Prevent default behavior for drag events
-    ['dragenter', 'dragover', 'dragleave', 'drop'].forEach((eventName) => {
+    ["dragenter", "dragover", "dragleave", "drop"].forEach((eventName) => {
       document.body.addEventListener(eventName, preventDefaults, false);
     });
 
@@ -21,13 +21,13 @@ class FileDragManager {
     this.dragleaveListener = this.dragleaveListener.bind(this);
     this.dropListener = this.dropListener.bind(this);
 
-    document.body.addEventListener('dragenter', this.dragenterListener);
+    document.body.addEventListener("dragenter", this.dragenterListener);
-    document.body.addEventListener('dragleave', this.dragleaveListener);
+    document.body.addEventListener("dragleave", this.dragleaveListener);
     // Add drop event listener
-    document.body.addEventListener('drop', this.dropListener);
+    document.body.addEventListener("drop", this.dropListener);
   }
 
-  setActions({updateFilename}) {
+  setActions({ updateFilename }) {
     this.updateFilename = updateFilename;
   }
 
@@ -35,7 +35,7 @@ class FileDragManager {
     if (cb) {
       this.callback = cb;
     } else {
-      this.callback = (files) => console.warn('FileDragManager not set');
+      this.callback = (files) => console.warn("FileDragManager not set");
     }
   }
 
@@ -43,21 +43,21 @@ class FileDragManager {
     this.dragCounter++;
     if (!this.overlay) {
       // Create and show the overlay
-      this.overlay = document.createElement('div');
+      this.overlay = document.createElement("div");
-      this.overlay.style.position = 'fixed';
+      this.overlay.style.position = "fixed";
       this.overlay.style.top = 0;
       this.overlay.style.left = 0;
-      this.overlay.style.width = '100%';
+      this.overlay.style.width = "100%";
-      this.overlay.style.height = '100%';
+      this.overlay.style.height = "100%";
-      this.overlay.style.background = 'rgba(0, 0, 0, 0.5)';
+      this.overlay.style.background = "rgba(0, 0, 0, 0.5)";
-      this.overlay.style.color = '#fff';
+      this.overlay.style.color = "#fff";
-      this.overlay.style.zIndex = '1000';
+      this.overlay.style.zIndex = "1000";
-      this.overlay.style.display = 'flex';
+      this.overlay.style.display = "flex";
-      this.overlay.style.alignItems = 'center';
+      this.overlay.style.alignItems = "center";
-      this.overlay.style.justifyContent = 'center';
+      this.overlay.style.justifyContent = "center";
-      this.overlay.style.pointerEvents = 'none';
+      this.overlay.style.pointerEvents = "none";
-      this.overlay.innerHTML = '<p>Drop files anywhere to upload</p>';
+      this.overlay.innerHTML = "<p>Drop files anywhere to upload</p>";
-      document.getElementById('content-wrap').appendChild(this.overlay);
+      document.getElementById("content-wrap").appendChild(this.overlay);
     }
   }
 
@@ -87,16 +87,16 @@ class FileDragManager {
           this.overlay = null;
         }
 
-        this.updateFilename(files ? files[0].name : '');
+        this.updateFilename(files ? files[0].name : "");
       });
   }
 
   async addImageFile(file, nextSiblingElement) {
-    const div = document.createElement('div');
+    const div = document.createElement("div");
-    div.classList.add('page-container');
+    div.classList.add("page-container");
 
-    var img = document.createElement('img');
+    var img = document.createElement("img");
-    img.classList.add('page-image');
+    img.classList.add("page-image");
     img.src = URL.createObjectURL(file);
     div.appendChild(img);
 

src/main/resources/static/js/pages/add-image.js

@@ -1,38 +1,23 @@
-window.goToFirstOrLastPage = goToFirstOrLastPage;
-
 document.getElementById('download-pdf').addEventListener('click', async () => {
-  const downloadButton = document.getElementById('download-pdf');
+  const modifiedPdf = await DraggableUtils.getOverlayedPdfDocument();
-  const originalContent = downloadButton.innerHTML;
+  const modifiedPdfBytes = await modifiedPdf.save();
-
+  const blob = new Blob([modifiedPdfBytes], {type: 'application/pdf'});
-  downloadButton.disabled = true;
+  const link = document.createElement('a');
-  downloadButton.innerHTML = `
+  link.href = URL.createObjectURL(blob);
-    <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+  link.download = originalFileName + '_addedImage.pdf';
-  `;
+  link.click();
-
-  try {
-    const modifiedPdf = await DraggableUtils.getOverlayedPdfDocument();
-    const modifiedPdfBytes = await modifiedPdf.save();
-    const blob = new Blob([modifiedPdfBytes], { type: 'application/pdf' });
-    const link = document.createElement('a');
-    link.href = URL.createObjectURL(blob);
-    link.download = originalFileName + '_addedImage.pdf';
-    link.click();
-  } finally {
-    downloadButton.disabled = false;
-    downloadButton.innerHTML = originalContent;
-  }
 });
 let originalFileName = '';
 document.querySelector('input[name=pdf-upload]').addEventListener('change', async (event) => {
   const fileInput = event.target;
   fileInput.addEventListener('file-input-change', async (e) => {
-    const { allFiles } = e.detail;
+    const {allFiles} = e.detail;
     if (allFiles && allFiles.length > 0) {
       const file = allFiles[0];
       originalFileName = file.name.replace(/\.[^/.]+$/, '');
       const pdfData = await file.arrayBuffer();
       pdfjsLib.GlobalWorkerOptions.workerSrc = './pdfjs-legacy/pdf.worker.mjs';
-      const pdfDoc = await pdfjsLib.getDocument({ data: pdfData }).promise;
+      const pdfDoc = await pdfjsLib.getDocument({data: pdfData}).promise;
       await DraggableUtils.renderPage(pdfDoc, 0);
 
       document.querySelectorAll('.show-on-file-selected').forEach((el) => {
@@ -45,11 +30,6 @@ document.addEventListener('DOMContentLoaded', () => {
   document.querySelectorAll('.show-on-file-selected').forEach((el) => {
     el.style.cssText = 'display:none !important';
   });
-  document.addEventListener('keydown', (e) => {
-    if (e.key === 'Delete') {
-      DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted());
-    }
-  });
 });
 
 const imageUpload = document.querySelector('input[name=image-upload]');
@@ -65,12 +45,3 @@ imageUpload.addEventListener('change', (e) => {
     };
   }
 });
-
-async function goToFirstOrLastPage(page) {
-  if (page) {
-    const lastPage = DraggableUtils.pdfDoc.numPages;
-    await DraggableUtils.goToPage(lastPage - 1);
-  } else {
-    await DraggableUtils.goToPage(0);
-  }
-}

src/main/resources/static/js/pages/sign.js

@@ -73,16 +73,6 @@ document.addEventListener('DOMContentLoaded', () => {
   document.querySelectorAll('.show-on-file-selected').forEach((el) => {
     el.style.cssText = 'display:none !important';
   });
-  document.querySelectorAll('.small-file-container-saved img ').forEach((img) => {
-    img.addEventListener('dragstart', (e) => {
-      e.dataTransfer.setData('fileUrl', img.src);
-    });
-  });
-  document.addEventListener('keydown', (e) => {
-    if (e.key === 'Delete') {
-      DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted());
-    }
-  });
 });
 
 const imageUpload = document.querySelector('input[name=image-upload]');
@@ -213,26 +203,11 @@ async function goToFirstOrLastPage(page) {
 }
 
 document.getElementById('download-pdf').addEventListener('click', async () => {
-  const downloadButton = document.getElementById('download-pdf');
+  const modifiedPdf = await DraggableUtils.getOverlayedPdfDocument();
-  const originalContent = downloadButton.innerHTML;
+  const modifiedPdfBytes = await modifiedPdf.save();
-
+  const blob = new Blob([modifiedPdfBytes], {type: 'application/pdf'});
-  downloadButton.disabled = true;
+  const link = document.createElement('a');
-  downloadButton.innerHTML = `
+  link.href = URL.createObjectURL(blob);
-    <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+  link.download = originalFileName + '_signed.pdf';
-  `;
+  link.click();
-
-  try {
-    const modifiedPdf = await DraggableUtils.getOverlayedPdfDocument();
-    const modifiedPdfBytes = await modifiedPdf.save();
-    const blob = new Blob([modifiedPdfBytes], {type: 'application/pdf'});
-    const link = document.createElement('a');
-    link.href = URL.createObjectURL(blob);
-    link.download = originalFileName + '_signed.pdf';
-    link.click();
-  } catch (error) {
-    console.error('Error downloading PDF:', error);
-  } finally {
-    downloadButton.disabled = false;
-    downloadButton.innerHTML = originalContent;
-  }
 });

src/main/resources/static/js/sign/signature-canvas.js

@@ -1,85 +0,0 @@
-const signaturePadCanvas = document.getElementById('drawing-pad-canvas');
-const signaturePad = new SignaturePad(signaturePadCanvas, {
-  minWidth: 1,
-  maxWidth: 2,
-  penColor: 'black',
-});
-
-function addDraggableFromPad() {
-  if (signaturePad.isEmpty()) return;
-  const startTime = Date.now();
-  const croppedDataUrl = getCroppedCanvasDataUrl(signaturePadCanvas);
-  console.log(Date.now() - startTime);
-  DraggableUtils.createDraggableCanvasFromUrl(croppedDataUrl);
-}
-
-function getCroppedCanvasDataUrl(canvas) {
-  let originalCtx = canvas.getContext('2d');
-  let originalWidth = canvas.width;
-  let originalHeight = canvas.height;
-  let imageData = originalCtx.getImageData(0, 0, originalWidth, originalHeight);
-
-  let minX = originalWidth + 1,
-    maxX = -1,
-    minY = originalHeight + 1,
-    maxY = -1,
-    x = 0,
-    y = 0,
-    currentPixelColorValueIndex;
-
-  for (y = 0; y < originalHeight; y++) {
-    for (x = 0; x < originalWidth; x++) {
-      currentPixelColorValueIndex = (y * originalWidth + x) * 4;
-      let currentPixelAlphaValue = imageData.data[currentPixelColorValueIndex + 3];
-      if (currentPixelAlphaValue > 0) {
-        if (minX > x) minX = x;
-        if (maxX < x) maxX = x;
-        if (minY > y) minY = y;
-        if (maxY < y) maxY = y;
-      }
-    }
-  }
-
-  let croppedWidth = maxX - minX;
-  let croppedHeight = maxY - minY;
-  if (croppedWidth < 0 || croppedHeight < 0) return null;
-  let cuttedImageData = originalCtx.getImageData(minX, minY, croppedWidth, croppedHeight);
-
-  let croppedCanvas = document.createElement('canvas'),
-    croppedCtx = croppedCanvas.getContext('2d');
-
-  croppedCanvas.width = croppedWidth;
-  croppedCanvas.height = croppedHeight;
-  croppedCtx.putImageData(cuttedImageData, 0, 0);
-
-  return croppedCanvas.toDataURL();
-}
-
-function isMobile() {
-  const userAgentCheck = /Mobi|Android|iPhone|iPad|iPod|Windows Phone|Opera Mini/i.test(navigator.userAgent);
-  const viewportCheck = window.matchMedia('(max-width: 768px)').matches;
-  return userAgentCheck || viewportCheck;
-}
-
-function getDeviceScalingFactor() {
-  return isMobile() ? 3 : 10;
-}
-
-function resizeCanvas() {
-  const ratio = Math.max(window.devicePixelRatio || 1, 1);
-  const additionalFactor = getDeviceScalingFactor();
-
-  signaturePadCanvas.width = signaturePadCanvas.offsetWidth * ratio * additionalFactor;
-  signaturePadCanvas.height = signaturePadCanvas.offsetHeight * ratio * additionalFactor;
-  signaturePadCanvas.getContext('2d').scale(ratio * additionalFactor, ratio * additionalFactor);
-
-  signaturePad.clear();
-}
-
-new IntersectionObserver((entries, observer) => {
-  if (entries.some((entry) => entry.intersectionRatio > 0)) {
-    resizeCanvas();
-  }
-}).observe(signaturePadCanvas);
-
-new ResizeObserver(resizeCanvas).observe(signaturePadCanvas);

src/main/resources/templates/fragments/common.html

@@ -213,10 +213,7 @@
                     unexpectedError: '[[#{decrypt.unexpectedError}]]',
                     serverError: '[[#{decrypt.serverError}]]',
                     success: '[[#{decrypt.success}]]',
-              };
+              };</script>
-              window.fileInput = {
-                dragAndDropPDF : '[[#{fileChooser.dragAndDropPDF}]]',
-                dragAndDropImage : '[[#{fileChooser.dragAndDropImage}]]'};</script>
                 <div class="custom-file-chooser mb-3" th:attr="data-bs-unique-id=${name}, data-bs-element-id=${name+'-input'}, data-bs-element-container-id=${name+'-input-container'}, data-bs-files-selected=#{filesSelected}, data-bs-pdf-prompt=#{pdfPrompt}">
                   <div class="mb-3 d-flex flex-row justify-content-center align-items-center flex-wrap input-container" th:name="${name}+'-input'" th:id="${name}+'-input-container'" th:data-text="#{fileChooser.hoveredDragAndDrop}">
                       <label class="file-input-btn d-none">
@@ -225,7 +222,7 @@
                       </label>
                       <div th:text="#{fileChooser.click}"></div>
                       <div th:text="#{fileChooser.or}"></div>
-                      <div  th:text="#{fileChooser.dragAndDrop}" id="dragAndDrop"></div>
+                      <div th:text="#{fileChooser.dragAndDrop}"></div>
                   </div>
                     <div class="selected-files flex-wrap"></div>
                 </div>

src/main/resources/templates/misc/add-image.html

@@ -1,123 +1,65 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-  xmlns:th="https://www.thymeleaf.org">
+  <head>
-
-<head>
   <th:block th:insert="~{fragments/common :: head(title=#{addImage.title}, header=#{addImage.header})}"></th:block>
-  <script th:src="@{'/js/thirdParty/interact.min.js'}"></script>
+    <script th:src="@{'/js/thirdParty/interact.min.js'}"></script>
-  <link rel="stylesheet" th:href="@{'/css/add-image.css'}">
+    <link rel="stylesheet" th:href="@{'/css/add-image.css'}">
-</head>
+  </head>
 
-<body>
+  <body>
-  <div id="page-container">
+    <div id="page-container">
-    <div id="content-wrap">
+      <div id="content-wrap">
-      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-      <br><br>
+        <br><br>
-      <div class="container">
+        <div class="container">
-        <div class="row justify-content-center">
+          <div class="row justify-content-center">
-          <div class="col-md-6 bg-card">
+            <div class="col-md-6 bg-card">
-            <div class="tool-header">
+              <div class="tool-header">
-              <span class="material-symbols-rounded tool-header-icon other">add_photo_alternate</span>
+                <span class="material-symbols-rounded tool-header-icon other">add_photo_alternate</span>
-              <span class="tool-header-text" th:text="#{addImage.header}"></span>
+                <span class="tool-header-text" th:text="#{addImage.header}"></span>
-            </div>
-
-            <!-- pdf selector -->
-            <div
-              th:replace="~{fragments/common :: fileSelector(name='pdf-upload', disableMultipleFiles=true, multipleInputsForSingleRequest=false, accept='application/pdf')}">
-            </div>
-            <script type="module" th:src="@{'/pdfjs-legacy/pdf.mjs'}"></script>
-            <script type="module" th:src="@{'/js/pages/add-image.js'}"></script>
-            <div class="tab-group show-on-file-selected">
-              <div
-                th:replace="~{fragments/common :: fileSelector(name='image-upload', disableMultipleFiles=false, multipleInputsForSingleRequest=true, accept='image/*', inputText=#{imgPrompt})}">
               </div>
-            </div>
 
-            <div class="draggable-buttons-box ignore-rtl">
+              <!-- pdf selector -->
-              <button class="btn btn-outline-secondary"
+              <div th:replace="~{fragments/common :: fileSelector(name='pdf-upload', disableMultipleFiles=true, multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                onclick="DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted())"
+              <script type="module" th:src="@{'/pdfjs-legacy/pdf.mjs'}"></script>
-                style="color: #C02223; border-color: #C02223; background-color: rgba(255, 0, 0, 0.1);">
+              <script type="module" th:src="@{'/js/pages/add-image.js'}"></script>
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash"
+              <div class="tab-group show-on-file-selected">
-                  viewBox="0 0 16 16">
+                  <div th:replace="~{fragments/common :: fileSelector(name='image-upload', disableMultipleFiles=true, multipleInputsForSingleRequest=true, accept='image/*', inputText=#{imgPrompt})}"></div>
-                  <path
+              </div>
-                    d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z" />
+
-                  <path
+              <!-- draggables box -->
-                    d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z" />
+              <div id="box-drag-container" class="show-on-file-selected">
-                </svg>
+                <canvas id="pdf-canvas"></canvas>
-                <span class="btn-tooltip" th:text="#{sign.delete}"></span>
+                <script th:src="@{'/js/draggable-utils.js'}"></script>
-              </button>
+                <div class="draggable-buttons-box ignore-rtl">
-              <button class="btn btn-outline-secondary"
+                  <button class="btn btn-outline-secondary" onclick="DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted())">
-                onclick="DraggableUtils.addAllPagesDraggableCanvas(DraggableUtils.getLastInteracted())">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
-                <span class="material-symbols-rounded">
+                      <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
-                  content_copy
+                      <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
-                </span>
+                    </svg>
-                <span class="btn-tooltip" th:text="#{sign.addToAll}"></span>
+                  </button>
-              </button>
+                  <button class="btn btn-outline-secondary" onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.incrementPage() : DraggableUtils.decrementPage()" style="margin-left:auto">
-              <div id="rotation-controls" class="align-items-center" style="display: none;">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-left" viewBox="0 0 16 16">
-                <div class="input-with-icon">
+                      <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z"/>
-                  <span class="material-symbols-rounded icon" style="margin-right: 3px;">
+                    </svg>
-                    screen_rotation
+                  </button>
-                  </span>
+                  <button class="btn btn-outline-secondary" onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.decrementPage() : DraggableUtils.incrementPage()">
-                  <input type="number" id="rotation-input" class="form-control form-control-sm me-2" value="0" step="10"
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
-                    style="width: 6rem" />
+                      <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+                    </svg>
+                  </button>
                 </div>
               </div>
-              <button id="ratioToggleBtn" class="btn btn-outline-secondary"
+
-                onclick="DraggableUtils.toggleMaintainRatio()">
+              <!-- download button -->
-                <span class="material-symbols-rounded">
+              <div class="margin-auto-parent">
-                  Aspect_Ratio
+                <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center" th:text="#{downloadPdf}"></button>
-                </span>
+              </div>
-                <span class="btn-tooltip" th:text="#{sign.maintainRatio}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(false)" style="margin-left:auto">
-                <span class="material-symbols-rounded">
-                  keyboard_double_arrow_left
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.first}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" id="incrementPage"
-                onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.incrementPage() : DraggableUtils.decrementPage()">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                  class="bi bi-chevron-left" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd"
-                    d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
-                </svg>
-                <span class="btn-tooltip" th:text="#{sign.previous}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" id="decrementPage"
-                onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.decrementPage() : DraggableUtils.incrementPage()">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                  class="bi bi-chevron-right" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd"
-                    d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
-                </svg>
-                <span class="btn-tooltip" th:text="#{sign.next}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(true)">
-                <span class="material-symbols-rounded">
-                  keyboard_double_arrow_right
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.last}"></span>
-              </button>
-              <button id="download-pdf" class="btn btn-outline-secondary"
-                style="color: green; border-color: green; background: rgba(0, 128, 0, 0.2)">
-                <span class="material-symbols-rounded">
-                  download
-                </span>
-                <span class="btn-tooltip" th:text="#{downloadPdf}"></span>
-              </button>
-            </div>
-            <!-- draggables box -->
-            <div id="box-drag-container" class="show-on-file-selected">
-              <canvas id="pdf-canvas"></canvas>
-              <script th:src="@{'/js/draggable-utils.js'}"></script>
             </div>
           </div>
         </div>
       </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
-    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </body>
-  </div>
-</body>
-
 </html>

src/main/resources/templates/misc/ocr-pdf.html

@@ -220,7 +220,7 @@
                 });
               </script>
               <p th:text="#{ocr.help}"></p>
-              <a href="https://docs.stirlingpdf.com/Advanced%20Configuration/OCR">https://docs.stirlingpdf.com/Advanced%20Configuration/OCR</a>
+              <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md">https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md</a>
             </div>
           </div>
         </div>

src/main/resources/templates/multi-tool.html

@@ -216,7 +216,7 @@
       undoManager
     )
 
-    fileDragManager.setCallback(async (files) => pdfContainer.handleDroppedFiles(files));
+    fileDragManager.setCallback(async (files) => pdfContainer.addFilesFromFiles(files));
     document.addEventListener('keydown', function(event) {
     let targetElementId = event.target.id;
 

src/main/resources/templates/pipeline.html

@@ -76,14 +76,14 @@
                   </div>
                   <br/>
                   <a
-                    href="https://docs.stirlingpdf.com/Advanced%20Configuration/Pipeline"
+                    href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/PipelineFeature.md"
                     target="_blank"
                     th:text="#{pipeline.help}"
                     >Pipeline Help</a
                   >
                   <br/>
                   <a
-                    href="https://docs.stirlingpdf.com/Advanced%20Configuration/Folder%20Scanning"
+                    href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/FolderScanning.md"
                     target="_blank"
                     th:text="#{pipeline.scanHelp}"
                     >Folder Scanning Help</a

src/main/resources/templates/sign.html

@@ -21,6 +21,8 @@
   </th:block>
   <script th:src="@{'/js/thirdParty/signature_pad.umd.min.js'}"></script>
   <script th:src="@{'/js/thirdParty/interact.min.js'}"></script>
+  <script type="module" th:src="@{'/js/pages/sign.js'}"></script>
+
 </head>
 
 <body>
@@ -30,7 +32,7 @@
       <br><br>
       <div class="container">
         <div class="row justify-content-center">
-          <div class="col-md-7 bg-card">
+          <div class="col-md-6 bg-card">
             <div class="tool-header">
               <span class="material-symbols-rounded tool-header-icon sign">signature</span>
               <span class="tool-header-text" th:text="#{sign.header}"></span>
@@ -44,7 +46,7 @@
             <div class="tab-group show-on-file-selected">
               <div class="tab-container" th:title="#{sign.upload}">
                 <div
-                  th:replace="~{fragments/common :: fileSelector(name='image-upload', disableMultipleFiles=false, multipleInputsForSingleRequest=true, accept='image/*', inputText=#{imgPrompt})}">
+                  th:replace="~{fragments/common :: fileSelector(name='image-upload', disableMultipleFiles=true, multipleInputsForSingleRequest=true, accept='image/*', inputText=#{imgPrompt})}">
                 </div>
               </div>
 
@@ -59,6 +61,13 @@
 
               <div class="tab-container" th:title="#{sign.saved}">
                 <div class="saved-signatures-section" th:if="${not #lists.isEmpty(signatures)}">
+                  <!-- View Toggle Button -->
+                  <div class="view-toggle mb-3">
+                    <button class="btn btn-outline-secondary btn-sm" onclick="toggleSignatureView()">
+                      <span class="material-symbols-rounded grid-view-text">view_list</span>
+                      <span class="material-symbols-rounded list-view-text" style="display: none;">grid_view</span>
+                    </button>
+                  </div>
 
                   <!-- Preview Modal -->
                   <div class="modal fade" id="signaturePreview" tabindex="-1">
@@ -80,49 +89,66 @@
                       </div>
                     </div>
                   </div>
-                  <!-- Personal Signatures -->
+
-                  <div th:if="${not #lists.isEmpty(signatures.?[category == 'Personal'])}">
+                  <!-- Grid View -->
-                    <h5 th:text="#{sign.personalSigs}"></h5>
+                  <div id="gridView">
-                    <div class="selected-files flex-wrap" style="position: relative; display:flex">
+                    <!-- Personal Signatures -->
-                      <div th:each="sig : ${signatures}" th:if="${sig.category == 'Personal'}"
+                    <div class="signature-category" th:if="${not #lists.isEmpty(signatures.?[category == 'Personal'])}">
-                        class="small-file-container-saved d-flex flex-column justify-content-center align-items-center">
+                      <h5 th:text="#{sign.personalSigs}"></h5>
-                        <div class="drag-icon"><svg xmlns="http://www.w3.org/2000/svg" height="24px"
+                      <div class="signature-grid">
-                            viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+                        <div th:each="sig : ${signatures}" th:if="${sig.category == 'Personal'}" class="signature-item">
-                            <path
+                          <img th:src="@{'/api/v1/general/sign/' + ${sig.fileName}}" th:alt="${sig.fileName}"
-                              d="M360-160q-33 0-56.5-23.5T280-240q0-33 23.5-56.5T360-320q33 0 56.5 23.5T440-240q0 33-23.5 56.5T360-160Zm240 0q-33 0-56.5-23.5T520-240q0-33 23.5-56.5T600-320q33 0 56.5 23.5T680-240q0 33-23.5 56.5T600-160ZM360-400q-33 0-56.5-23.5T280-480q0-33 23.5-56.5T360-560q33 0 56.5 23.5T440-480q0 33-23.5 56.5T360-400Zm240 0q-33 0-56.5-23.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 33-23.5 56.5T600-400ZM360-640q-33 0-56.5-23.5T280-720q0-33 23.5-56.5T360-800q33 0 56.5 23.5T440-720q0 33-23.5 56.5T360-640Zm240 0q-33 0-56.5-23.5T520-720q0-33 23.5-56.5T600-800q33 0 56.5 23.5T680-720q0 33-23.5 56.5T600-640Z">
+                            th:data-filename="${sig.fileName}" style="max-width: 200px; cursor: pointer;"
-                            </path>
+                            onclick="DraggableUtils.createDraggableCanvasFromUrl(this.src)" />
-                          </svg></div>
-                        <img th:src="@{'/api/v1/general/sign/' + ${sig.fileName}}" th:alt="${sig.fileName}"
-                          th:data-filename="${sig.fileName}" style="width: 50px; height: 50px; object-fit: cover;" />
-                        <div class="file-info d-flex flex-column align-items-center justify-content-center">
                           <div class="signature-name" th:text="${sig.fileName}"></div>
                         </div>
-
                       </div>
                     </div>
-                  </div>
 
-                  <!-- Shared Signatures -->
+                    <!-- Shared Signatures -->
-                  <div th:if="${not #lists.isEmpty(signatures.?[category == 'Shared'])}">
+                    <div class="signature-category" th:if="${not #lists.isEmpty(signatures.?[category == 'Shared'])}">
-                    <h5 th:text="#{sign.sharedSigs}"></h5>
+                      <h5 th:text="#{sign.sharedSigs}"></h5>
-                    <div class="selected-files flex-wrap" style="position: relative; display: flex;">
+                      <div class="signature-grid">
-                      <div th:each="sig : ${signatures}" th:if="${sig.category == 'Shared'}"
+                        <div th:each="sig : ${signatures}" th:if="${sig.category == 'Shared'}" class="signature-item">
-                        class="small-file-container-saved d-flex flex-column justify-content-center align-items-center">
+                          <img th:src="@{'/api/v1/general/sign/' + ${sig.fileName}}" th:alt="${sig.fileName}"
-                        <div class="drag-icon"><svg xmlns="http://www.w3.org/2000/svg" height="24px"
+                            th:data-filename="${sig.fileName}" style="max-width: 200px; cursor: pointer;"
-                            viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+                            onclick="DraggableUtils.createDraggableCanvasFromUrl(this.src)" />
-                            <path
-                              d="M360-160q-33 0-56.5-23.5T280-240q0-33 23.5-56.5T360-320q33 0 56.5 23.5T440-240q0 33-23.5 56.5T360-160Zm240 0q-33 0-56.5-23.5T520-240q0-33 23.5-56.5T600-320q33 0 56.5 23.5T680-240q0 33-23.5 56.5T600-160ZM360-400q-33 0-56.5-23.5T280-480q0-33 23.5-56.5T360-560q33 0 56.5 23.5T440-480q0 33-23.5 56.5T360-400Zm240 0q-33 0-56.5-23.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 33-23.5 56.5T600-400ZM360-640q-33 0-56.5-23.5T280-720q0-33 23.5-56.5T360-800q33 0 56.5 23.5T440-720q0 33-23.5 56.5T360-640Zm240 0q-33 0-56.5-23.5T520-720q0-33 23.5-56.5T600-800q33 0 56.5 23.5T680-720q0 33-23.5 56.5T600-640Z">
-                            </path>
-                          </svg></div>
-                        <img th:src="@{'/api/v1/general/sign/' + ${sig.fileName}}" th:alt="${sig.fileName}"
-                          th:data-filename="${sig.fileName}" style="width: 50px; height: 50px; object-fit: cover;" />
-                        <div class="file-info d-flex flex-column align-items-center justify-content-center">
                           <div class="signature-name" th:text="${sig.fileName}"></div>
                         </div>
                       </div>
                     </div>
                   </div>
 
+                  <!-- List View (Initially Hidden) -->
+                  <div id="listView" style="display: none;">
+                    <!-- Personal Signatures -->
+                    <div class="signature-category" th:if="${not #lists.isEmpty(signatures.?[category == 'Personal'])}">
+                      <h5 th:text="#{sign.personalSigs}"></h5>
+                      <div class="signature-list">
+                        <div th:each="sig : ${signatures}" th:if="${sig.category == 'Personal'}"
+                          class="signature-list-item" th:data-src="@{'/api/v1/general/sign/' + ${sig.fileName}}"
+                          onclick="previewSignature(this)">
+                          <div class="signature-list-info">
+                            <span th:text="${sig.fileName}" class="signature-list-name"></span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <!-- Shared Signatures -->
+                    <div class="signature-category" th:if="${not #lists.isEmpty(signatures.?[category == 'Shared'])}">
+                      <h5 th:text="#{sign.sharedSigs}"></h5>
+                      <div class="signature-list">
+                        <div th:each="sig : ${signatures}" th:if="${sig.category == 'Shared'}"
+                          class="signature-list-item" th:data-src="@{'/api/v1/general/sign/' + ${sig.fileName}}"
+                          onclick="previewSignature(this)">
+                          <div class="signature-list-info">
+                            <span th:text="${sig.fileName}" class="signature-list-name"></span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <div th:if="${#lists.isEmpty(signatures)}" class="text-center p-3">
                   <p th:text="#{sign.noSavedSigs}">No saved signatures found</p>
@@ -143,99 +169,72 @@
                 </div>
               </div>
             </div>
-            <script th:src="@{'/js/sign/signature-canvas.js'}"></script>
             <!-- draggables box -->
-            <div class="draggable-buttons-box ignore-rtl">
-              <button class="btn btn-outline-secondary"
-                onclick="DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted())"
-                style="border-color: #C02223; color: #C02223; background: rgba(255, 0, 0, 0.1)">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash"
-                  viewBox="0 0 16 16">
-                  <path
-                    d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z" />
-                  <path
-                    d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z" />
-                </svg>
-                <span class="btn-tooltip" th:text="#{sign.delete}"></span>
-              </button>
-              <button class="btn btn-outline-secondary"
-                onclick="DraggableUtils.addAllPagesDraggableCanvas(DraggableUtils.getLastInteracted())">
-                <span class="material-symbols-rounded">
-                  content_copy
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.addToAll}"></span>
-              </button>
-              <div id="rotation-controls" class="align-items-center" style="display: none;">
-                <div class="input-with-icon">
-                  <span class="material-symbols-rounded icon" style="margin-right: 3px;">
-                    screen_rotation
-                  </span>
-                  <input type="number" id="rotation-input" class="form-control form-control-sm me-2" value="0" step="10"
-                    style="width: 6rem" />
-                </div>
-              </div>
-              <button id="ratioToggleBtn" class="btn btn-outline-secondary"
-                onclick="DraggableUtils.toggleMaintainRatio()">
-                <span class="material-symbols-rounded">
-                  Aspect_Ratio
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.maintainRatio}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(false)" style="margin-left:auto">
-                <span class="material-symbols-rounded">
-                  keyboard_double_arrow_left
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.first}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" id="incrementPage"
-                onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.incrementPage() : DraggableUtils.decrementPage()">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                  class="bi bi-chevron-left" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd"
-                    d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
-                </svg>
-                <span class="btn-tooltip" th:text="#{sign.previous}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" id="decrementPage"
-                onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.decrementPage() : DraggableUtils.incrementPage()">
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                  class="bi bi-chevron-right" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd"
-                    d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
-                </svg>
-                <span class="btn-tooltip" th:text="#{sign.next}"></span>
-              </button>
-              <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(true)">
-                <span class="material-symbols-rounded">
-                  keyboard_double_arrow_right
-                </span>
-                <span class="btn-tooltip" th:text="#{sign.last}"></span>
-              </button>
-              <button id="download-pdf" class="btn btn-outline-secondary"
-                style="color: green;border-color: green; background: rgba(0, 128, 0, 0.2);">
-                <span class="material-symbols-rounded">
-                  download
-                </span>
-                <span class="btn-tooltip" th:text="#{downloadPdf}"></span>
-              </button>
-            </div>
             <div id="box-drag-container" class="show-on-file-selected">
-
               <canvas id="pdf-canvas"></canvas>
-              <script th:src="@{'/js/thirdParty/pdf-lib.min.js'}"></script>
-              <script src="https://cdn.jsdelivr.net/npm/fabric@latest/dist/index.min.js"></script>
               <script th:src="@{'/js/draggable-utils.js'}"></script>
-              <script type="module" th:src="@{'/js/pages/sign.js'}"></script>
+              <div class="draggable-buttons-box ignore-rtl">
+                <button class="btn btn-outline-secondary"
+                  onclick="DraggableUtils.deleteDraggableCanvas(DraggableUtils.getLastInteracted())">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash"
+                    viewBox="0 0 16 16">
+                    <path
+                      d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z" />
+                    <path
+                      d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z" />
+                  </svg>
+                  <span class="btn-tooltip" th:text="#{sign.delete}"></span>
+                </button>
+                <button class="btn btn-outline-secondary"
+                  onclick="DraggableUtils.addAllPagesDraggableCanvas(DraggableUtils.getLastInteracted())">
+                  <span class="material-symbols-rounded">
+                    content_copy
+                  </span>
+                  <span class="btn-tooltip" th:text="#{sign.addToAll}"></span>
+                </button>
+                <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(false)" style="margin-left:auto">
+                  <span class="material-symbols-rounded">
+                    keyboard_double_arrow_left
+                  </span>
+                  <span class="btn-tooltip" th:text="#{sign.first}"></span>
+                </button>
+                <button class="btn btn-outline-secondary" id="incrementPage"
+                  onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.incrementPage() : DraggableUtils.decrementPage()">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                    class="bi bi-chevron-left" viewBox="0 0 16 16">
+                    <path fill-rule="evenodd"
+                      d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
+                  </svg>
+                  <span class="btn-tooltip" th:text="#{sign.previous}"></span>
+                </button>
+                <button class="btn btn-outline-secondary" id="decrementPage"
+                  onclick="document.documentElement.getAttribute('dir')==='rtl' ? DraggableUtils.decrementPage() : DraggableUtils.incrementPage()">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                    class="bi bi-chevron-right" viewBox="0 0 16 16">
+                    <path fill-rule="evenodd"
+                      d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
+                  </svg>
+                  <span class="btn-tooltip" th:text="#{sign.next}"></span>
+                </button>
+                <button class="btn btn-outline-secondary" onclick="goToFirstOrLastPage(true)">
+                  <span class="material-symbols-rounded">
+                    keyboard_double_arrow_right
+                  </span>
+                  <span class="btn-tooltip" th:text="#{sign.last}"></span>
+                </button>
+              </div>
+            </div>
+            <!-- download button -->
+            <div class="margin-auto-parent">
+              <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center"
+                th:text="#{downloadPdf}"></button>
             </div>
-
           </div>
         </div>
       </div>
     </div>
     <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
   </div>
-  </script>
-
 </body>
 
 </html>

src/test/java/stirling/software/SPDF/utils/GeneralUtilsTest.java

@@ -52,68 +52,14 @@ public class GeneralUtilsTest {
     @Test
     void nFuncAdvanced3() {
         List<Integer> result = GeneralUtils.parsePageList(new String[]{"4n+1"}, 9, true);
-        assertEquals(List.of(5, 9), result, "'All' keyword should return all pages.");
+        assertEquals(List.of(1, 5, 9), result, "'All' keyword should return all pages.");
-    }
-
-    @Test
-    void nFunc_spaces() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"n + 1"}, 9, true);
-        assertEquals(List.of(2, 3, 4, 5, 6, 7, 8, 9), result);
-    }
-
-    @Test
-    void nFunc_consecutive_Ns_nnn() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"nnn"}, 9, true);
-        assertEquals(List.of(1, 8), result);
-    }
-
-    @Test
-    void nFunc_consecutive_Ns_nn() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"nn"}, 9, true);
-        assertEquals(List.of(1, 4, 9), result);
-    }
-
-    @Test
-    void nFunc_opening_closing_round_brackets() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"(n-1)(n-2)"}, 9, true);
-        assertEquals(List.of(2, 6), result);
-    }
-
-    @Test
-    void nFunc_opening_round_brackets() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"2(n-1)"}, 9, true);
-        assertEquals(List.of(2, 4, 6, 8), result);
-    }
-
-    @Test
-    void nFunc_opening_round_brackets_n() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"n(n-1)"}, 9, true);
-        assertEquals(List.of(2, 6), result);
-    }
-
-    @Test
-    void nFunc_closing_round_brackets() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"(n-1)2"}, 9, true);
-        assertEquals(List.of(2, 4, 6, 8), result);
-    }
-
-    @Test
-    void nFunc_closing_round_brackets_n() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"(n-1)n"}, 9, true);
-        assertEquals(List.of(2, 6), result);
-    }
-
-    @Test
-    void nFunc_function_surrounded_with_brackets() {
-        List<Integer> result = GeneralUtils.parsePageList(new String[]{"(n-1)"}, 9, true);
-        assertEquals(List.of(1, 2, 3, 4, 5, 6, 7, 8), result);
     }
 
 
     @Test
     void nFuncAdvanced4() {
         List<Integer> result = GeneralUtils.parsePageList(new String[]{"3+2n"}, 9, true);
-        assertEquals(List.of(5, 7, 9), result, "'All' keyword should return all pages.");
+        assertEquals(List.of(3, 5, 7, 9), result, "'All' keyword should return all pages.");
     }
 
     @Test
@@ -134,6 +80,7 @@ public class GeneralUtilsTest {
         assertEquals(List.of(1, 2, 3), result, "Range should be parsed correctly.");
     }
 
+
     @Test
     void testParsePageListWithRangeZeroBaseOutput() {
         List<Integer> result = GeneralUtils.parsePageList(new String[]{"1-3"}, 5, false);

test.sh

@@ -74,7 +74,7 @@ main() {
 
     # Building Docker images
    # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
-  # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
+  # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
 	
     # Test each configuration
     #run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml"
@@ -94,8 +94,8 @@ main() {
 
     # Building Docker images with security enabled
    # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
- #   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
+ #   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .
+    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile-fat .
     
     
     # Test each configuration with security