DGNum/Stirling-PDF
14
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity
2225 commits 6 branches 64 tags 66 MiB
Commit graph

1226 commits

Author SHA1 Message Date
Ludy
3189d9dda8
Check DOCKER_ENABLE_SECURITY for UI (#1103) 
When using `DOCKER_ENABLE_SECURITY=false`, the logout button and `Account Settings` are no longer displayed.
 2024-04-21 21:16:39 +01:00
Ludy
a5000fbbc5
UI: settings show/hide update display (#1072) 
* UI: settings show/hide update display

This PR replaces the PR #1003

In this PR, the visual for available update is added to the foreground.

There are new settings to generally show/hide the update display, and only administrators receive the update display.

* change to `Bean`

* Update AppUpdateShowService.java

* add update message

* revision service

* change shouldShow

* Update githubVersion.js

* rm folder

* Update AppUpdateService.java
 2024-04-21 12:15:18 +01:00
albanobattistella
e74a8e434b
Update messages_it_IT.properties (#1096) 2024-04-21 09:16:05 +01:00
phfuh
b702f5772d
Add selection for PDF/A output format (#1095) 
* Create PdfToPdfARequest.java

* Change class, add output format

* Add input field for output format

* Change output format selection order
 2024-04-21 08:44:05 +01:00
Han
943071ebb7
Update messages_tr_TR.properties (#1092) 2024-04-20 19:18:20 +01:00
Anthony Stirling
06a178cc03
Cache form inputs between runs (#1066) 
* Changes!

* lang
 2024-04-20 14:46:49 +01:00
diemade
73f90885b4
Update messages_de_DE.properties (#1069) 
Only full sentences should end in a period,

Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-04-20 10:45:58 +01:00
Ludy
ace4e200b1
Fix: Resolve Username Case Sensitivity Issue in Login Flow (#1070) 
* Fix: Username changing

The only situation where the username must be unique is when changing the username.

* Update UserController.java
 2024-04-14 22:07:03 +01:00
albanobattistella
276b6e521a
Update messages_it_IT.properties (#1062) 2024-04-11 22:40:05 +01:00
Ludy
35a4462a86
replace comma to dot (#1057) 
In several countries the comma is used as a decimal, the PR will replace the comma with a dot.
 2024-04-09 17:47:53 +01:00
pixeebot[bot]
5564f378e5
(Sonar) Fix "String#replace should be preferred to String#replaceAll" (#1056) 
Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>
 2024-04-09 06:52:52 +01:00
Dimitris Kaitantzidis
0f367c23aa
359 split metadata lost (#1049) 
* Closes #359

* Adds a minor fix, the modified date should be changed after a modification is made.
 2024-04-08 20:53:00 +00:00
Ludy
7dd1679588
Ukrainian - add missing strings (#1048) 
add missing strings
 2024-04-08 21:37:30 +01:00
Foivos Proestakis
6b186d5d8e
Improve Greek translation (#1046) 
* Update and Improve Greek translation

# Update Greek Translations

## Description

- Updated translations for all pages and content on the website.
- Corrected grammatical errors or typos in the Greek translation.
- Improved the overall readability and flow of the translated text.

This commit aims to enhance the user experience for Greek-speaking users of the website.

* Update messages_el_GR.properties
 2024-04-08 21:29:31 +01:00
Ludy
d53be3aa14
add Ukrainian README, languages.html and correction FR, IT (#1044) 2024-04-08 21:29:13 +01:00
Eric
3dbfde534e
fix: missing pdf to html endpoint (#1043) 
* fix: missing pdf to html endpoint

* refactor: remove unused variable

---------

Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-04-08 21:28:57 +01:00
vkykalo
9a57842ece
Feature: Add Ukrainian Language Support (#1039) 
* Add uk_UA lang

* Add added error translation block into  uk_UA lang

---------

Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-04-08 21:27:55 +01:00
CocoMaster-AI
ec83b9a17d
Update ja_JP,ko_KR,ru_RU,zh_TW.properties (#1036) 2024-04-08 21:27:36 +01:00
Ludy
59a19b0091
Update messages_de_DE.properties (#1045) 2024-04-08 20:25:14 +00:00
Dimitris Kaitantzidis
471865e4a3
Closes #359 (#1047) 2024-04-08 21:23:03 +01:00
Anthony Stirling
3868b4eca2 updates 2024-04-05 13:05:16 +01:00
Han
64f8765115
Update messages_tr_TR.properties (#1032) 
update TR
 2024-04-05 12:58:54 +01:00
albanobattistella
160a4e9f8d
Update messages_it_IT.properties (#1031) 2024-04-04 21:52:24 +01:00
pixeebot[bot]
54c3bee205
Replaced Stream.collect(Collectors.toList()) with Stream.toList() (Sonar) (#1018) 
Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>
 2024-04-03 22:41:24 +01:00
NicolasFR
a63c0a3625
lang: update fr_FR (#1020) 
Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-04-03 22:41:07 +01:00
Dimitris Doukas
3103a0bffc
Enhance description for "Split PDF" functionality (#1025) 
* Update screen of homepage

* Fix description for "Split PDF" except AR

* Fix description for "Split PDF" in AR

* Fix one mistake on AR

* Keep clear this branch from other branches
 2024-04-03 22:40:35 +01:00
CocoMaster-AI
c0c137d1b0
Sponsor information supports translate now (#1023) 
Sponsored information supports translate now
 2024-04-03 10:02:01 +01:00
NicolasFR
255c018415
Update messages_fr_FR.properties (#1011) 
fix(lang): fix a translation error
 2024-04-01 17:55:22 +01:00
albanobattistella
df27ed6907
Update messages_it_IT.properties (#1010) 2024-04-01 15:04:05 +01:00
CocoMaster-AI
989491b903
Extract text from error pages and sync text variable to all lang (#1008) 
* feat: extract text from error pages

* feat: sync text variables to langs.properties

---------

Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-04-01 11:04:56 +01:00
albanobattistella
3d6b145db5
Update messages_it_IT.properties (#1002) 2024-03-30 19:51:44 +00:00
CocoMaster-AI
37a63242a6
Update messages_ru_RU.properties (#999) 2024-03-30 10:26:51 +00:00
Eric
dfb8c64f5a
fix: switch to pdftohtml for pdf to html conversions (#998) 
* fix: switch to pdftohtml for pdf to html conversions

* build: include poppler-utils in dockerfile for pdftohtml
 2024-03-29 17:02:33 -04:00
Anthony Stirling
ca890e4b32 Pipeline fix quick 2024-03-29 11:03:13 +00:00
CocoMaster-AI
4834d01223
feat: translate messages_ko_KR.properties, messages_ru_RU.properties completed (#996) 
* feat: translate ko_KR.properties completed

* feat: feat: translate ru_RU.properties completed
 2024-03-29 10:17:10 +00:00
albanobattistella
84b3bb1aed
Update messages_it_IT.properties (#993) 2024-03-28 20:50:29 +00:00
Anthony Stirling
a9679da719 Revert weasy 2024-03-28 19:38:56 +00:00
Anthony Stirling
f10b3ffe3c multiTool.uploadPrompts 2024-03-28 17:45:58 +00:00
SuperFan
ea982d6412
fix: Add MultiTool UploadPrompts zh_CN And en_US (#977) 
Co-authored-by: superfan <admin@henniubi.com>
Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
 2024-03-28 17:44:21 +00:00
pixeebot[bot]
1035a3be31
Define a constant for a literal string that is duplicated n times (Sonar) (#978) 
Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>
 2024-03-28 17:44:10 +00:00
github-actions[bot]
c16db14cd9
Update 3rd Party Licenses (#992) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-28 17:43:30 +00:00
Anthony Stirling
08e43cc89c fix #986 and #989 2024-03-28 17:09:21 +00:00
CocoMaster-AI
eda838d6f8
feat: Extract translation text from html and finished the mainly translation of zh_CN, zh_TW, ja_JP file (#987) 
* feat: translate zh_cn properties

* feat: adjust some description messages_zh_CN.properties

* feat: translate zh_TW file done

* feat: zh_CN semantic optimization

* feat: Supplementary ja_JP translation

* feat: extract rest text

* feat: Sync to all lang.properties

* feat: translate zh_CN, zh_TW, ja_JP file

* fix: small bug

---------

Co-authored-by: yanyu_lin <yanyu_lin@bestsign.cn>
 2024-03-28 16:53:39 +00:00
Anthony Stirling
2fff3083ae
Update TextFinder.java (#980) 2024-03-26 19:25:16 +00:00
tkymmm
7e2d58b3e8
Update messages_ja_JP.properties (#975) 2024-03-26 06:55:51 +00:00
NeilJared
31ec385282
Update messages_es_ES.properties (#969) 
Updated es_ES translation (100% done)
 2024-03-25 19:07:53 +00:00
Anthony Stirling
3800e3e465
Update view-pdf.html 2024-03-22 18:15:10 +00:00
github-actions[bot]
e2bd73dbf3
Update 3rd Party Licenses (#966) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-21 21:42:34 +00:00
github-actions[bot]
a20c3018ae
Update 3rd Party Licenses (#965) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-21 21:41:09 +00:00
github-actions[bot]
3c53f97c36
Update 3rd Party Licenses (#960) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-21 21:17:53 +00:00
Ludy
67a1529dc7
Change to html5 (#958) 
* Change to html5

with Nu Html Checker

* Update scale-pages.html

* Update sign.html

* Update common.html

* Update common.html

* Update login.html
 2024-03-21 20:58:01 +00:00
github-actions[bot]
77354f47bf
Update 3rd Party Licenses (#952) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-21 20:12:47 +00:00
albanobattistella
4a3326a560
Update messages_it_IT.properties (#927) 2024-03-17 14:24:07 +00:00
Ludy
24862e2d4a
changes characters in multiple languages - Unicode ascii (#925) 
* unicode to readable font

* Update messages_de_DE.properties
 2024-03-17 11:09:55 +00:00
Ludy
51bb26ae34
Fix: Error after logging out and selecting another language (#924) 
Fix exception url after logout
 2024-03-17 09:57:17 +00:00
Anthony Stirling
f474651f36
lang, save to browser (#923) 2024-03-17 09:33:05 +00:00
github-actions[bot]
3066b3e500
Update 3rd Party Licenses (#919) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-14 23:00:38 +00:00
github-actions[bot]
e1bb0cf5ec
Update 3rd Party Licenses (#914) 
Signed-off-by: GitHub Action <action@github.com>
Co-authored-by: GitHub Action <action@github.com>
 2024-03-13 22:45:32 +00:00
Listiges Känguru
70e4ac21df
Update messages_de_DE.properties (#903) 
Added missing translations, improved some existing translations.
 2024-03-13 22:11:43 +00:00
Ludy
9cc7a49d12
Enforcing Username Uniqueness (#906) 
* Enforcing Username Uniqueness

Changes in UserService.java:

Added a new method findByUsername to allow searching for usernames regardless of case sensitivity.
Added a new method isUsernameValid to validate the username.
Changes in UserController.java:

Updated the changeUsername method to ensure the new username is valid before changing it.
Updated the editUser method to ensure the new username is unique and valid.
Changes in UserRepository.java:

Added a custom JPQL query to search for usernames regardless of case sensitivity.
Changes in HTML templates (account.html and addUsers.html):

Error messages are displayed if a username is invalid or already exists.

* JPAs auto
 2024-03-13 22:09:16 +00:00
Anthony Stirling
ae73595335
Number of fixes and making pipline LIVE ! (#907) 
Closes #889 and #332
#710
#901
#885
 2024-03-13 19:15:10 +00:00
pavedroad
ac620082ec
chore: fix some typos (#900) 
Signed-off-by: pavedroad <qcqs@outlook.com>
 2024-03-12 19:42:15 -04:00
Anthony Stirling
1e4134c7d1
Number fxes (#898) 
* init

* user and pass to just pass lang update

* session management fixes and avoid demo user locking

* fix for UMASK and extract cleanups

* fixes for user #889 and #332

* increase session count for demo site

* fix

* gcc

* formatting

* number fixes init

* || true test

* version bump

* Hardening suggestions for Stirling-PDF / numberFxes (#899)

Switch order of literals to prevent NullPointerException

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>

---------

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>
 2024-03-10 14:00:00 +00:00
albanobattistella
a7bcdd0003
Update messages_it_IT.properties (#891) 2024-03-09 14:03:58 +00:00
Anthony Stirling
121af0501a
fixes for user permissions (#892) 2024-03-09 14:03:46 +00:00
Ludy
82c4e9cf41
Fix TypeError by rotation (#890) 
Fixes the error in the PDF multitool when rotating all pages at the same time.
 2024-03-09 12:18:00 +00:00
Ludy
142e11a59a
added missing translation strings (#888) 2024-03-09 08:08:33 +00:00
Anthony Stirling
08205ed32d
Custom uid (#883) 
* init

* user and pass to just pass lang update

* session management fixes and avoid demo user locking

* fix for UMASK and extract cleanups
 2024-03-08 20:49:19 +00:00
Anthony Stirling
9246b42057
Login fixes (#881) 
* init

* user and pass to just pass lang update

* session management fixes and avoid demo user locking

* Hardening suggestions for Stirling-PDF / loginFixes (#882)

Switch order of literals to prevent NullPointerException

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>

---------

Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com>
 2024-03-08 18:06:40 +00:00
albanobattistella
67e4d6e3a2
Update messages_it_IT.properties (#878) 2024-03-07 21:47:21 +00:00
Anthony Stirling
cf4613d043
Password fix and others (#875) 
* init

* user and pass to just pass lang update
 2024-03-07 20:12:07 +00:00
Eric
2f703796e9
fix(SplitPDF): create immutable list for dynamic additions (#877) 2024-03-07 12:05:26 -05:00
albanobattistella
731dc3f3dc
Update messages_it_IT.properties (#870) 2024-03-06 22:24:30 +00:00
Ludy
97472310f2
Show the user roles as real names (#867) 
* Show the user roles as real names

* Add error message

* Update Role.java

* default Language without translation

* Update messages_el_GR.properties
 2024-03-06 22:14:02 +00:00
Anthony Stirling
ece1d071c0
non root user and fix book/html calibre (#856) 
* non root user and fix book/html calibre

* version bump

* Update docker-compose-latest.yml

* remove customApp

---------

Co-authored-by: systo <systo@host.docker.internal>
 2024-03-04 20:51:49 +00:00
albanobattistella
20f532c872
Update messages_it_IT.properties (#858) 
Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>
 2024-03-04 20:36:18 +00:00
Ludy
bdcccfd937
🐛 Fix: index out of bounds #861 #842 (#863) 
* 🐛 Fix: `index out of bounds` #861 #842

* Update RearrangePagesPDFController.java

* Update RearrangePagesPDFController.java
 2024-03-04 20:14:45 +00:00
Ludy
146b8f0103
Corrected the reading of the port. See: #834 (#855) 
* Corrected the reading of the port. See: #834

* Removed outdated import

---------

Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>
 2024-02-25 19:15:03 -05:00
懒猫
c8a37245fa
Added option to split PDF into multiple parts and merge into one PDF (#841) 
* Added option to split PDF into multiple parts and merge into one PDF

* Use the mergeDocuments method in MergeController to implement merging

---------

Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>
 2024-02-24 15:26:35 -05:00
Parth P Shah
af68c70239
Update SPdfApplication.java (#853) 
* Update SPdfApplication.java

* Update SPdfApplication.java

* Update SPdfApplication.java

---------

Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com>
 2024-02-24 15:22:47 -05:00
Ludy
5bd544dcd7
Removed: Duplicate Properties Keys pt_PT (#854) 2024-02-24 19:45:07 +00:00
Parth P Shah
6fef4ea82c Update SPdfApplication.java 2024-02-24 00:01:20 +05:30
Parth P Shah
8670afb96f Revert "Update SPdfApplication.java" 
This reverts commit 33f8d60900.
 2024-02-23 23:46:42 +05:30
Parth P Shah
33f8d60900 Update SPdfApplication.java 2024-02-23 23:46:36 +05:30
albanobattistella
4e2156ad79
Update messages_it_IT.properties (#839) 2024-02-21 17:30:55 -05:00
seku80
f96a4cdb59
Update pt_PT 
Fixed missing line #14 and removing duplicate entry line #870
 2024-02-19 16:46:35 +00:00
seku80
efea22aa6e
Update languages.html 2024-02-19 16:19:29 +00:00
seku80
ae9a7dc580
Add files via upload 2024-02-19 16:13:16 +00:00
seku80
7135ace1aa
Add files via upload 2024-02-19 15:03:28 +00:00
Anthony Stirling
625275124a fix for #818 2024-02-18 15:47:19 +00:00
Anthony Stirling
c96ebccae4 Download message for game 2024-02-18 13:30:56 +00:00
Anthony Stirling
20cb460a7e controls and sizing bounds 2024-02-18 09:45:50 +00:00
Anthony Stirling
3a62d19979 game const 2024-02-18 09:21:30 +00:00
Ludy
51ad741744
Fix 746 (#825) 
* Fix: #746

* formatting
 2024-02-18 07:40:30 +00:00
Anthony Stirling
673f005fe6
Game fixes and ocr docs (#824) 2024-02-17 23:23:07 +00:00
Ludy
8d9f0361d0
Fix Serbia Language (#822) 
* Fix Serbia Language

* Rename messages_sr_Latn_RS.properties to messages_sr_LATN_RS.properties

* Update languages.html

* Update README.md
 2024-02-17 19:56:56 +00:00
albanobattistella
148dcdaee7
Update messages_it_IT.properties (#816) 2024-02-17 13:22:15 +00:00
Anthony Stirling
a5f0777892
Update ConfigInitializer.java for auto settings removal 2024-02-17 13:10:00 +00:00
Aliarev
6fc9c7be90
Update french translation (#814) 2024-02-16 22:24:26 +00:00
Ludy
e4a76e96af
HTML, CSS, JS and JAVA corrections (#810) 
* CSS corrections

* HTML corrections

* JS corrections

* JAVA corrections

* remove tab

* CSS corrections 2

* JS corrections 2

* back to the roots

* max-linie 127

* add slash hr|br

* return bootstrap-icons.css

* return bootstrap-icons.min.css

* return bootstrap.min.css

* Update bootstrap-icons.css

* Update bootstrap-icons.min.css

* Update bootstrap-icons.min.css

* Update bootstrap.min.css

* CSS corrections

* HTML corrections

* JS corrections

* JAVA corrections

* remove tab

* CSS corrections 2

* JS corrections 2

* back to the roots

* max-linie 127

* add slash hr|br

* return bootstrap-icons.css

* Update bootstrap-icons.css

* Bootstrap CSS

* Update prism.css
 2024-02-16 21:49:06 +00:00
NeilJared
639aed7120
Update messages_es_ES.properties 
Updated es_ES translation
 2024-02-14 12:22:47 +01:00
NeilJared
994bb4d1d2
Update messages_es_ES.properties 
Minor bug fixes: es_ES translation
 2024-02-14 11:57:34 +01:00
Ludy87
3cfb554623
missing propertie pageSelectionPrompt 2024-02-11 21:10:04 +01:00
Ludy87
17cc31d6e7 add placeholder translation 2024-02-11 14:32:34 -05:00
Ludy87
0c6e10a6dd add separator 2024-02-11 14:32:34 -05:00
Ludy87
297c57631f remove dublicate -> change showJS.tags to autoRedact.tags 2024-02-11 14:32:34 -05:00
Ludy87
bd4e252bb6 added missing strings 2024-02-11 14:32:33 -05:00
Ludy87
0ce34c70bc Update messages_de_DE.properties 2024-02-11 14:32:33 -05:00
Ludy87
4df75cfba1 Update messages_de_DE.properties 2024-02-11 14:32:33 -05:00
Ludy87
2aa435bcfb double spaces removed 2024-02-11 14:32:33 -05:00
Ludy87
0a4a9e6947 Removed unnecessary characters and added DE missing strings 2024-02-11 14:32:32 -05:00
Anthony Stirling
d5860d0b55
Update PdfToTextOrRTFRequest.java 2024-02-11 18:47:43 +00:00
sbplat
4f3b85e66b refactor: normalize files that contained both CRLF and LF 2024-02-11 12:14:21 -05:00
sbplat
55d4fda01b refactor: normalize files 2024-02-11 11:47:00 -05:00
Anthony Stirling
5a4efa81a7 more icon changes 2024-02-10 16:22:59 +00:00
Anthony Stirling
ea59c12b27 icon changes 2024-02-10 16:17:47 +00:00
Anthony Stirling
9600f91dda bigger icons 2024-02-10 16:11:45 +00:00
Anthony Stirling
a9f93b014a icon change 2024-02-10 15:56:41 +00:00
Anthony Stirling
26af6b5636 cleanups formatting 2024-02-10 14:52:59 +00:00
Anthony Stirling
0fabfea56d page adjusts for stamp 2024-02-10 14:52:27 +00:00
Anthony Stirling
fd8f3ce019
Merge pull request #798 from Stirling-Tools/pixeebot/fixes 
Hardening suggestions for Stirling-PDF / fixes
 2024-02-10 00:33:33 +00:00
Anthony Stirling
6f72096953 more fixes 2024-02-10 00:21:00 +00:00
Anthony Stirling
5a52e3d6dd other changes 2024-02-10 00:08:54 +00:00
pixeebot[bot]
23672cd18d Modernize and secure temp file creation 2024-02-10 00:08:18 +00:00
pixeebot[bot]
68c0941666 Sanitized user-provided file names in HTTP multipart uploads 2024-02-10 00:08:18 +00:00
Anthony Stirling
96e399a617 changing html and book labels 2024-02-10 00:00:07 +00:00
Anthony Stirling
22343e507d fixes 2024-02-09 23:45:18 +00:00
Anthony Stirling
8a143d139c Merge remote-tracking branch 'origin/main' into fixes 2024-02-09 23:30:25 +00:00
Anthony Stirling
15ad46fe1c book htmk 2024-02-09 23:24:25 +00:00
Anthony Stirling
0d5b790443
Merge branch 'main' into fixed_remove_pages_exception#761 2024-02-08 17:19:30 +00:00
mannam
41686883ee Fixed remove pages un-handled exception with space in input #761 2024-02-08 21:03:57 +05:30
pixeebot[bot]
4e937a6024 Sanitized user-provided file names in HTTP multipart uploads 2024-02-08 02:46:39 +00:00
sbplat
4af58118c9 fix: use the same margins for x and y in the stamp feature 2024-02-07 21:40:33 -05:00
NeilJared
3f932ebec9
Update messages_es_ES.properties 
Updated es_ES translation (100%)
 2024-02-06 10:03:55 +01:00
Stirling-PDF-Bot
296f265391 Update 3rd Party Licenses 2024-02-06 08:39:13 +00:00
Anthony Stirling
ca8519cb10 Merge remote-tracking branch 'origin/main' into fixes 2024-02-06 00:01:15 +00:00
Anthony Stirling
734d76a3b5 test 2024-02-06 00:00:49 +00:00
Michel Heusschen
96f4e5eac7 fix: small corrections for Dutch language 2024-02-04 18:08:55 +01:00
pixeebot[bot]
95471a2fba Switch order of literals to prevent NullPointerException 2024-02-02 00:29:18 +00:00
pixeebot[bot]
734fff5618 Modernize and secure temp file creation 2024-02-02 00:15:46 +00:00
pixeebot[bot]
c8dfe10a7c Sanitized user-provided file names in HTTP multipart uploads 2024-02-01 23:48:27 +00:00
pixeebot[bot]
8e0c02a151 Sandboxed URL creation to prevent SSRF attacks 2024-02-01 23:35:05 +00:00
pixeebot[bot]
91caa2a097 Introduced protections against system command injection 2024-02-01 23:18:24 +00:00
Anthony Stirling
6105451e08
Merge pull request #766 from Stirling-Tools/pixeebot/drip-2024-02-01-pixee-java/limit-readline 
Protect `readLine()` against DoS
 2024-02-01 23:05:22 +00:00
pixeebot[bot]
450e090252 Protect readLine() against DoS 2024-02-01 23:01:04 +00:00
pixeebot[bot]
e20f4fe31a Introduced protections against "zip slip" attacks 2024-02-01 22:41:49 +00:00
Eric
a884f1b3d4
Merge branch 'main' into main 2024-02-01 00:13:14 -05:00
Eric
d524fcc157
Merge branch 'main' into watermark_newline 2024-01-31 12:55:29 -05:00
Eric
73bbb516d2
Merge branch 'main' into fix_extract_image 2024-01-31 12:51:47 -05:00
ProvaTeams
55020d45f8 Using the flag logic 2024-01-31 14:09:16 +00:00
sbplat
2d37c707e2 feat: support '\n' literal in add watermark 2024-01-31 00:54:51 -05:00
ProvaTeams
b00f8c80ec Add required attribute to input file 2024-01-29 19:13:57 +01:00
sbplat
53afb865c5 refactor: replace ImageFinder with getAllImages using strategy behind ExtractImagesController 2024-01-29 11:23:58 -05:00
Michel Heusschen
e77d2847ea add new translations 2024-01-29 07:49:02 +01:00
Michel Heusschen
46abae9acc Merge branch 'main' of https://github.com/michelheusschen/Stirling-PDF into update-dutch-translation 2024-01-29 07:27:28 +01:00
Anthony Stirling
07e9fcb6cc
Merge pull request #737 from michelheusschen/fix/merge-tool-file-selection 
fix: show only selected files for merge tool
 2024-01-28 20:22:45 +00:00
albanobattistella
746f2d0949
Update messages_it_IT.properties 2024-01-28 21:18:57 +01:00
Anthony Stirling
589cb8d91f
Add files via upload 2024-01-28 20:11:15 +00:00
Anthony Stirling
6acb593411
Update AutoSplitPdfController.java 2024-01-28 18:17:32 +00:00
Anthony Stirling
8060451713
Update AutoSplitPdfController.java 2024-01-28 18:16:59 +00:00
Anthony Stirling
0fbc461877
Merge branch 'main' into pipelineFixes 2024-01-28 17:41:17 +00:00
Anthony Stirling
89e461e4f6 formats 2024-01-28 17:39:07 +00:00
Anthony Stirling
ba4ad1aff9 langs 2024-01-28 17:37:02 +00:00
Anthony Stirling
be1904749b Add stamp, fix html, change accepts 2024-01-28 17:36:17 +00:00
Michel Heusschen
166fa0eb87 fix: show only selected files for merge tool 2024-01-23 16:06:57 +01:00
Michel Heusschen
9a06e7a3ca typo 2024-01-23 14:14:54 +01:00
Michel Heusschen
cb12af2d95 update Dutch (nl_NL) translation 2024-01-23 14:11:53 +01:00
Anthony Stirling
4a6bd60466
Merge branch 'main' into fix/multi-tool-filename 2024-01-22 18:38:25 +00:00
sbplat
06ef09035d fix: remove blank pages not handling EXIT_FAILURE code properly 2024-01-22 10:39:29 -05:00
Anthony Stirling
13301e4606
Merge branch 'main' into fix/multi-tool-filename 2024-01-20 22:29:59 +00:00
Anthony Stirling
b59651a0fb
Merge pull request #722 from phfuh/push 
Update messages_de_DE.properties
 2024-01-20 19:20:53 +00:00
andrewdolphin
e4dded3faa
Remove bootstrap css from view-pdf.html that is causing issues when adding images 2024-01-19 10:31:05 +00:00
Anthony Stirling
75cf3ed0c1 Resolve wkhtml and formatting 2024-01-18 23:28:39 +00:00
Anthony Stirling
2fa68be36b pipeline fixes 2024-01-18 21:57:41 +00:00
phfuh
d09b252a4a
Update messages_de_DE.properties 
Translated the new entries, some corrections
 2024-01-18 19:48:21 +01:00
sbplat
a5165b04cd fix(multi-tool): refactor fileInput.js into a class, fix filename variable typos, and update updateFilename logic for dropping files 2024-01-18 01:08:31 -05:00
Dan Henry
1bd17eded6 call updateFilenameInput on file drop 2024-01-18 12:08:32 +11:00
Dan Henry
18d289d3b7 Move filename input logic to its own function 2024-01-18 12:07:02 +11:00
Stirling-PDF-Bot
e43e6d18b9 Update 3rd Party Licenses 2024-01-17 23:52:12 +00:00
tkymmm
ec5a3c5948
Update messages_ja_JP.properties 
Updated Japanese translation.
 2024-01-15 10:16:46 +09:00
Stirling-PDF-Bot
89c0e721b8 Update 3rd Party Licenses 2024-01-15 00:13:30 +00:00
Anthony Stirling
3912f42128 changeCreds message 2024-01-13 10:08:42 +00:00
Anthony Stirling
c8acddb251 Resolve split sections 2024-01-13 01:05:43 +00:00
Anthony Stirling
d8cf7e81b9 fixes 2024-01-13 00:55:43 +00:00
Anthony Stirling
c4ad442ec3 remove logs 2024-01-13 00:46:17 +00:00
Anthony Stirling
c8e5023ec1 fix 2024-01-13 00:37:19 +00:00
Anthony Stirling
5281d7a49a pdfbox3 upgrade and fix 2024-01-12 23:15:27 +00:00
TieStone
81d49b722b add table support in md2pdf transport 2024-01-11 14:54:01 +08:00
TieStone
ab9e7bbb8c add table support in md2pdf transport 2024-01-11 14:54:01 +08:00
TieStone
ee223d0405 add table support 2024-01-11 14:54:01 +08:00
Stirling-PDF-Bot
99050ad73e Update 3rd Party Licenses 2024-01-11 14:40:26 +08:00
sbplat
66df7053bb
Merge branch 'main' into version_fix 2024-01-09 21:17:57 -05:00
sbplat
edde1a6436 fix: version showing as 0.0.0 2024-01-09 21:13:35 -05:00
Anthony Stirling
1924dfb4f1
Merge branch 'main' into ebook 2024-01-10 00:40:17 +00:00
Anthony Stirling
873a4ecb7e revert 2024-01-10 00:39:26 +00:00
Anthony Stirling
32da14acbf log removal 2024-01-10 00:37:55 +00:00
Anthony Stirling
e717d83f75 fixes and timeouts 2024-01-10 00:33:07 +00:00
Anthony Stirling
ef12c2f892 Add ebook support 2024-01-09 22:39:21 +00:00
Anthony Stirling
2544b762ba
Merge branch 'main' into stamp 2024-01-06 22:18:29 +00:00
albanobattistella
c8458ffe50
Update messages_it_IT.properties 2024-01-05 20:39:01 +01:00
Anthony Stirling
572f9f728f lang 2024-01-05 18:00:30 +00:00
Anthony Stirling
6c963e1b6c format 2024-01-04 23:04:15 +00:00
Anthony Stirling
db64b3f71d lang and footer updates 2024-01-04 20:59:52 +00:00
Anthony Stirling
550f8b0eea licenses remove about 2024-01-04 19:01:37 +00:00
Anthony Stirling
b5d5b6e3e2 remove comment 2024-01-04 18:59:54 +00:00
Anthony Stirling
97b6f0eeb4 Merge remote-tracking branch 'origin/main' into licenses 2024-01-04 18:56:54 +00:00
Anthony Stirling
eee7e4d707
Merge branch 'main' into cert-sign 2024-01-04 18:50:02 +00:00
Anthony Stirling
43410de851 Merge remote-tracking branch 'origin/main' into licenses 2024-01-04 18:48:05 +00:00
Anthony Stirling
37c92ee9aa Merge remote-tracking branch 'origin/main' into licenses 2024-01-04 18:42:14 +00:00
Anthony Stirling
351cf25f86 license lang 2024-01-04 18:41:33 +00:00
92mn
5e40f00bae
Update languages.html 2024-01-04 19:16:59 +01:00
92mn
cebc0daf2b
Rename message_sr_Latin_RS.propreties to message_sr-Latn-RS.propreties 2024-01-04 19:16:31 +01:00
92mn
04f3f735fc
Added Serbian Latin 
Added Serbian Latin translation
 2024-01-04 17:28:58 +01:00
92mn
f7ef8c32aa
Added Serbian flag 
Added Serbian flag
 2024-01-04 16:33:10 +01:00
92mn
49f2071a93
Update languages.html 
Added Serbian ( Latin )
 2024-01-04 16:30:00 +01:00
sbplat
eadd513b02 chore(translation): add certsign jks to en-GB 2024-01-03 21:54:15 -05:00
sbplat
97f581ad6d feat: add java keystore certificate option for pdf signing 2024-01-03 21:51:30 -05:00
sbplat
d96a3db60a fix: add pem support for cert sign 2024-01-03 18:21:59 -05:00
Anthony Stirling
0592bac5bf liceneses without translation or GH action 2024-01-03 23:01:33 +00:00
sbplat
a244d563f2
Merge branch 'main' into cert-sign 2024-01-03 15:50:46 -05:00
sbplat
f433e8032f fix: pkcs12 signing 
TODO: add PEM support and use page number
 2024-01-03 15:49:08 -05:00
Anthony Stirling
23b85dc47c
Merge pull request #647 from albanobattistella/patch-5 
Update messages_it_IT.properties
 2024-01-03 20:41:16 +00:00
Anthony Stirling
6fe268adcb eol 2024-01-03 17:59:04 +00:00
albanobattistella
38ebc28108
Update messages_it_IT.properties 2024-01-03 18:29:01 +01:00
Peter Dave Hello
2a744473f9 Add a basic Traditional Chinese translation 
The svg flag file came from:

Flag of the Republic of China - Taiwan - Wikipedia
https://en.wikipedia.org/wiki/Taiwan#/media/File:Flag_of_the_Republic_of_China.svg
 2024-01-04 00:01:15 +08:00
Anthony Stirling
dfee149da0
Merge branch 'main' into on_hover-pagenumber-display#527 2024-01-02 21:35:29 +00:00
mannam
5af5794dfe display page number on mouse-hover issue#527 2024-01-02 16:44:57 +05:30
Andrey Voronkov
f32832f70d Add meta::description; pass header variable 2024-01-02 02:44:49 +03:00
ThePandaB0i
c67eaf2b4d
Fixed Turkish languages.html 
Added the missing "data-bs-language-code" to Turkish language dropdown item.
 2024-01-01 23:52:03 +03:00
Anthony Stirling
9795c68220 revert 2024-01-01 19:30:43 +00:00
Anthony Stirling
7ffa447cbc remove logs 2024-01-01 18:57:12 +00:00
Anthony Stirling
03a8f45128 cleanup 2024-01-01 14:46:19 +00:00
Anthony Stirling
b5423f3434 langs 2024-01-01 14:26:41 +00:00
Anthony Stirling
88c993367f init lang changes 2024-01-01 14:19:22 +00:00
Anthony Stirling
04acdb3b02 Fix for ANY values and settings button enablement 2024-01-01 13:57:22 +00:00
Anthony Stirling
cd3cc15888 minor changes 2024-01-01 13:46:09 +00:00
Anthony Stirling
76e6a23674 split fixes 2024-01-01 12:14:46 +00:00
Anthony Stirling
b74819cf6c lang 2023-12-31 16:01:27 +00:00
Anthony Stirling
a5ad9e13fe todo 2023-12-31 14:56:08 +00:00
Anthony Stirling
328e873344 remove prints 2023-12-31 13:35:58 +00:00
Anthony Stirling
39045df785 formats 2023-12-31 13:34:35 +00:00
Anthony Stirling
d83bd1ae94
Merge branch 'main' into changes 2023-12-31 13:33:10 +00:00
Anthony Stirling
143b770882 format 2023-12-31 13:28:18 +00:00
Anthony Stirling
d91c600925 pipeline fix 2023-12-31 13:27:06 +00:00
Anthony Stirling
cbac784c57 pipeline 2023-12-31 13:16:04 +00:00
Anthony Stirling
f535387ac4 pipeline enhance for MI 2023-12-31 13:05:38 +00:00
sbplat
5b0145fa47 misc: change all repo links from Frooodle to Stirling-Tools 2023-12-30 18:22:46 -05:00
sbplat
7dfeb4bb0f
Update footer.html 2023-12-30 18:12:06 -05:00
sbplat
cf640c7e3f refactor: have a newline between annotations 2023-12-30 14:50:59 -05:00
sbplat
15e0048bfc
Merge pull request #617 from Frooodle/spotlessFormat 
Spotless format
 2023-12-30 14:39:36 -05:00
Anthony Stirling
5f771b7851 formatting 2023-12-30 19:11:27 +00:00
Anthony Stirling
c853465d1d tests 2023-12-30 18:56:07 +00:00
sbplat
b58cbdcb61
Merge branch 'main' into spotless 2023-12-30 13:04:23 -05:00
albanobattistella
a92479b505
Update messages_it_IT.properties 2023-12-30 18:19:51 +01:00
Anthony Stirling
6ca9001fe6 enable status check without apikey 2023-12-30 13:42:24 +00:00
Anthony Stirling
f8ad71aa4e
Merge branch 'main' into added-remove-button-529 2023-12-30 11:26:32 +00:00
Anthony Stirling
1baf458344
Merge branch 'main' into added-remove-button-529 2023-12-30 11:24:56 +00:00
Anthony Stirling
da50e4d212
Merge branch 'main' into mannam11/file-override-fix-529 2023-12-30 11:24:45 +00:00
mannam
bbd8de0899 added a remove button issue#529 2023-12-30 16:42:41 +05:30
NeilJared
6a7ed615e3
Merge branch 'Frooodle:main' into main 2023-12-30 09:10:26 +01:00
NeilJared
56cbb4381b
Update messages_es_ES.properties 2023-12-30 09:09:27 +01:00
mannam
4612b05199 overriding previously selected files issue#529 2023-12-30 13:32:54 +05:30
sbplat
e3c8af7e54 chore: use spotless googleJavaFormat 2023-12-29 21:34:36 -05:00
Anthony Stirling
a5ee10e029 required flase 2023-12-30 02:19:30 +00:00
Anthony Stirling
bb1d41d74a
Merge pull request #605 from Frooodle/expose-port 
refactor: expose local application server port
 2023-12-29 23:27:59 +00:00
Anthony Stirling
e1f0a6cb1d messages 2023-12-29 22:56:38 +00:00
Anthony Stirling
e6622dfdc4 overlay fix for sequential 2023-12-29 22:53:46 +00:00
sbplat
34b4ae0e03 refactor: reflect changes to pipeline release 2023-12-29 17:13:36 -05:00
sbplat
036fd711f9
Merge branch 'main' into expose-port 2023-12-29 17:01:49 -05:00
Anthony Stirling
cbe4bca716 add banner and remove unused class 2023-12-29 21:46:17 +00:00
Anthony Stirling
232a556425 Merge branch 'test' of git@github.com:Frooodle/Stirling-PDF.git into test 2023-12-29 21:05:42 +00:00
Anthony Stirling
a497ad8c41 api changes to get metrics working 2023-12-29 21:05:32 +00:00
Anthony Stirling
3041e80c37
Merge branch 'main' into test 2023-12-29 20:48:27 +00:00
Anthony Stirling
1b2df20fdd reviews 2023-12-29 20:48:21 +00:00
sbplat
94aba370e0 refactor: expose local application server port 2023-12-29 13:05:01 -05:00
TieStone
cd49d7ffa2 add more Chinese Translations 2023-12-30 00:45:36 +08:00
TieStone
dc297644d1 add more Chinese Translations 2023-12-30 00:45:36 +08:00
TieStone
a7b4e44e6d remove duplicated property keys 2023-12-30 00:45:36 +08:00
Anthony Stirling
610ff22abe empty dir fix 2023-12-29 13:53:55 +00:00
Anthony Stirling
168a0f001c changes 2023-12-29 13:30:28 +00:00
Anthony Stirling
5c6936b494 Rework and cleanup 2023-12-29 12:55:22 +00:00
Anthony Stirling
a715dbb25d cleanup 2023-12-29 11:43:36 +00:00
Satyam Kashyap
6f3cbe0cae added missing hindi (hi_IN) translations and fixed some broken translations - also updated readme to reflect the newly added translations 2023-12-29 06:05:48 +00:00
Anthony Stirling
d63519bbf4
Merge branch 'main' into add-hindi-language 2023-12-28 18:54:56 +00:00
vivekmaru36
3e3f4a0188 Add hindi Translation 2023-12-28 23:09:38 +05:30
Anthony Stirling
5fcb4e893b pipeline refactor beginnings 2023-12-28 17:23:19 +00:00
sbplat
5a055bae5e
Merge branch 'main' into main 2023-12-28 11:47:44 -05:00
Anthony Stirling
8acab77ae3 contextPath fixes 2023-12-28 13:50:31 +00:00
albanobattistella
e2c5027311
Update messages_it_IT.properties 2023-12-28 10:28:21 +01:00
Anthony Stirling
48158379ee
Merge branch 'main' into id-translate 2023-12-28 09:03:02 +00:00
Aan
6ba84a190f
translate file word to indonesia 2023-12-28 15:34:50 +07:00
Aan
d349aea1be
Translate file word 2023-12-28 15:30:36 +07:00
Aan
79e2683cbe
Keep watermark translation 2023-12-28 15:12:18 +07:00
sbplat
d405b7a810
perf: avoid re-rendering the first pdf page 2023-12-27 22:46:55 -05:00
sbplat
1d243a0ca5
fix: clean up redundant variable 2023-12-27 22:43:30 -05:00
sbplat
1f10693eaf fix: sequentially convert each pdf page into a BufferedImage to avoid getting MLE for large pdf files 2023-12-28 03:23:55 +00:00
Anthony Stirling
3911be0177 Add Demo user 2023-12-27 22:56:51 +00:00
Anthony Stirling
78da44ad83 fix for #583 2023-12-27 19:28:49 +00:00
Anthony Stirling
e9947da5b4 changes 2023-12-27 15:18:26 +00:00
albanobattistella
d79db6f3da
Update messages_it_IT.properties 2023-12-27 16:01:00 +01:00
Anthony Stirling
84aebe3851 validate button color 2023-12-27 13:22:28 +00:00
Anthony Stirling
f5c285a70f mild cleanup 2023-12-27 12:51:17 +00:00
Perdana Hadi
2d6bf43bdb update tags translations 2023-12-27 15:52:11 +07:00
Aan
d325020e22
home page section done, todo tags extractImages.tags 2023-12-27 14:37:25 +07:00
Aan
aec85ddd66
missing quote 2023-12-27 14:09:57 +07:00
Perdana Hadi
32b009b11f remove extra line, add white space 2023-12-27 12:38:17 +07:00
Perdana Hadi
2e5b72e4fb add web-pages translation 2023-12-27 12:28:31 +07:00
Aan
1d3cf2bdc3
Remove DS_Store 2023-12-27 10:27:39 +07:00
Aan
2a5fe2bd74
27/12/2023 2023-12-27 10:06:09 +07:00
Anthony Stirling
61ff0248da close 2023-12-27 01:00:42 +00:00
Anthony Stirling
659af2089c setup 2023-12-27 00:53:31 +00:00
Anthony Stirling
6ee8e1e37f auto disable in UI 2023-12-26 20:33:17 +00:00
Anthony Stirling
05977aa3a6 enableAlphaFunctionality 2023-12-26 20:10:37 +00:00
sbplat
eaf65d7981 fix: add selectedPosition style to the Add Page Number position selector default value 2023-12-26 13:31:33 -05:00
sbplat
4d3e442ecc fix: add default value for the position in Add Page Numbers 2023-12-26 13:26:37 -05:00
Aan
cf42ef7faa
Intial Draft #1 2023-12-26 12:38:27 +07:00
Anthony Stirling
8938e86223
Merge branch 'main' into main 2023-12-25 22:24:30 +00:00
dkaitantzidis
cf3693186a Fixes headers issue in merge pdfs. 2023-12-25 23:27:08 +02:00
Anthony Stirling
0fb0cb8bca apply local 2023-12-25 20:51:32 +00:00
dkaitantzidis
fb18d0d04d WIP: Fixes issue - needs refactor 2023-12-25 22:36:08 +02:00
sbplat
779d9028fe fix(multitool): hide dragged pdf page at the start so it doesn't teleport 2023-12-25 15:34:16 -05:00
Anthony Stirling
f2b701e3e3 todos 2023-12-25 18:52:11 +00:00
Anthony Stirling
a138d5f5a9 imports 2023-12-25 16:16:50 +00:00
Anthony Stirling
6276f028ac validate operations 2023-12-25 16:15:42 +00:00
Anthony Stirling
b962e867d8 log remove 2023-12-25 15:17:06 +00:00
Anthony Stirling
a286a92ede cleanups 2023-12-25 15:15:46 +00:00
Anthony Stirling
03d3235e1d Merge remote-tracking branch 'origin/main' into test 2023-12-25 13:26:13 +00:00
Anthony Stirling
dd9dd72f35 Role stuff 2023-12-25 12:58:49 +00:00
sbplat
3469beb5b3 feat: merge pdf into multiple frames if the format is TIFF instead of a single big image 2023-12-24 22:52:39 -05:00
Anthony Stirling
690720f4e3 test interface 2023-12-25 01:25:17 +00:00
sbplat
a868b2c649 feat: make multiple images the default setting for PDF to Image 2023-12-24 16:55:11 -05:00
sbplat
995a926e35 fix!: map BMP and TIFF extensions to the proper MIME types 
Remove the WBMP image format from PDF to Image
 2023-12-24 15:27:16 -05:00
Anthony Stirling
d9b5d08b06 import clean 2023-12-24 17:56:31 +00:00
sbplat
3f50979d3e fix: use JPEGFactory for jpeg 2023-12-24 12:52:55 -05:00
Anthony Stirling
2f5d7ed712 internal API plus brute force security 2023-12-24 17:12:32 +00:00
sbplat
1efefcfcb8 feat: add support for svg+webp images to convert to pdf 2023-12-23 20:27:04 -05:00
sbplat
116b3535ee Update messages_en_GB.properties 2023-12-23 13:49:50 -05:00
sbplat
b7d6107a2d feat: add remove annotations 2023-12-23 13:47:21 -05:00
Anthony Stirling
120b017b1a serial 2023-12-23 16:26:09 +00:00
Anthony Stirling
03450454c5 pipeline 2023-12-23 15:47:18 +00:00
simovics
7e982e125d
Create hu.svg 
Adding Hungarian flag icon to the set.
 2023-12-23 14:46:42 +01:00
simovics
e725451530
Update languages.html 
Fixing indentation.
 2023-12-23 14:21:51 +01:00
simovics
d7d6bc8108
Update languages.html 
Adding Hungarian language reference to the navbar.
 2023-12-23 14:19:07 +01:00
simovics
6d66ac0a8b
Create messages_hu_HU.properties 
Hungarian translation for Stirling-PDF.
 2023-12-23 14:15:10 +01:00
Anthony Stirling
93f12d1313 pipeline changes 2023-12-23 12:29:32 +00:00
Anthony Stirling
eab9e3cffc changes pipeline 2023-12-20 19:29:13 +00:00
NeilJared
beab9932d7
Update messages_es_ES.properties 
Updated es_ES translation
 2023-12-19 19:41:11 +01:00
Dan Henry
b66f86f7cc add missing bootstrap icons link in head 2023-12-19 22:51:00 +11:00
Dan Henry
168ef747de add up to date minified bootstrap icons 2023-12-19 22:50:46 +11:00
Anthony Stirling
631d3948bd fix for #531 plus seperated out some things 2023-12-18 14:52:18 +00:00