Commit Graph

5210 Commits

Author SHA1 Message Date
238cf93a22 Merge pull request 'resolve release/1.15.0 to develop merge conflict' from 1.15-conflict into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/92
2026-02-13 13:45:16 +00:00
10bc689f13 Merge remote-tracking branch 'remotes/origin/release/1.15.0' into 1.15-conflict 2026-02-13 16:02:58 +03:00
d532f3d8de nodejs: fix lint 2026-02-13 16:01:14 +03:00
59a8e2f63d fix(go): merge lossy-edit bugfix and new formats handling 2026-02-13 16:35:15 +07:00
0bdaa40036 Merge pull request 'bugfix-1.15' from bugfix-1.15 into release/1.15.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/91
2026-02-13 09:03:33 +00:00
a60fd14daf increase default upload file size to 100 MB. Fix Bug 79567 2026-02-12 13:49:42 +07:00
f55196a1b2 fix(ruby): resolve fillform urls with proxy. Fix Bug 79584 2026-02-12 13:01:28 +07:00
bc434dea55 fix(ruby): correct platforms in gemfile.lock 2026-02-11 16:08:37 +07:00
af895ee2e6 Merge pull request 'update-deps' from update-deps into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/90
2026-02-11 06:51:53 +00:00
8c725214af fix: files list height. Fix Bug 71461 2026-02-10 17:35:30 +07:00
dd513194bb build(php-laravel): bump psy/psysh to 0.12.19 2026-02-10 14:41:15 +07:00
6069c017c0 build(php-laravel): bump phpunit/phpunit to 11.5.50 2026-02-10 14:27:34 +07:00
fbc3d47607 build(nodejs): bump fast-xml-parser to 5.3.4 2026-02-10 14:17:24 +07:00
f8222b1052 build(php): bump phpunit/phpunit to 10.5.62 2026-02-10 14:14:50 +07:00
4c331d56d7 Merge pull request 'bugfix-1.15' from bugfix-1.15 into release/1.15.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/89
2026-02-06 12:12:22 +00:00
ea3667174f fix(java-spring): correct roles for named users. Fix Bug 79808 2026-02-06 18:34:27 +07:00
ada17c99f7 fix(nodejs): use path module to get file basename. Fix Bug 79810 2026-02-06 17:39:09 +07:00
7a1cc7cbdc fix(go): move anonymous to the end of users list. Fix Bug 79785 2026-02-06 13:09:18 +07:00
9a7350e169 Merge pull request 'bugfix-release-1.15' from bugfix-release-1.15 into release/1.15.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/88
2026-02-02 11:47:23 +00:00
0c33288120 fix(go): allow edit files with lossy-edit action. Fix Bug 79626 2026-02-02 16:26:18 +07:00
aff50cca4a fix(ruby): string forcesavetype check. Fix Bug 79584 2026-02-02 16:26:18 +07:00
7aca0edfed fix(php-laravel): correct conversion of uploaded files with password. Fix Bug 79569 2026-02-02 16:26:18 +07:00
2a3bcc0f67 fix(php-laravel): increase max upload file size and fix env variable. Fix Bug 79567 2026-02-02 16:26:18 +07:00
1da1dec76c fix(go): correct processing of document passwords 2026-02-02 16:25:45 +07:00
701d65dfaf Merge pull request 'build(nodejs): bump qs to 6.14.1' from nodejs-bump-qs into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/86
v99.99.99.4511 v99.99.99.4510 v99.99.99.4509 v99.99.99.4513 v99.99.99.4514
2026-01-27 07:09:23 +00:00
5fa447b489 build(nodejs): bump qs to 6.14.1 2026-01-27 13:07:17 +07:00
c092db2566 Merge pull request 'fix(java): correct dataInsertImage object' from java-fix-data-insert-image into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/85
v99.99.99.4504 v99.99.99.4502 v99.99.99.4503 v99.99.99.4505 v99.99.99.4506 v99.99.99.4507 v99.99.99.4508
2026-01-20 12:34:35 +00:00
873692e038 fix(java): correct dataInsertImage object 2026-01-20 17:40:21 +07:00
9dadd4cb28 Merge remote-tracking branch 'remotes/origin/release/1.15.0' into develop
# Conflicts:
#	web/documentserver-example/go/utils/format.go
v99.99.99.4501 v99.99.99.4500 v99.99.99.4499 v99.99.99.4498 v99.99.99.4497
2026-01-15 15:05:23 +03:00
9c6667325f Copyright 2026 2026-01-15 15:03:03 +03:00
8ea1f2c296 Merge pull request 'nodejs: update jws and js-yaml packages' from nodejs-audit-fix into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/84
v99.99.99.4465 v99.99.99.4461 v99.99.99.4472 v99.99.99.4471 v99.99.99.4470 v99.99.99.4469 v99.99.99.4468 v99.99.99.4474 v99.99.99.4464 v99.99.99.4463 v99.99.99.4462 v99.99.99.4475 v99.99.99.4476 v99.99.99.4477 v99.99.99.4473 v99.99.99.4478 v99.99.99.4496
2025-12-12 07:19:26 +00:00
d4c41ed9c5 nodejs: update jws and js-yaml packages 2025-12-12 11:40:12 +07:00
614219f5fc feat: added approve msgspec to python/.check-licenses.yml v99.99.99.4458 v99.99.99.4459 v99.99.99.4460 2025-12-09 13:11:13 +03:00
b1191be00d extend directurl description (Fix Bug 79000) v99.99.99.4456 v99.99.99.4457 2025-12-08 17:17:33 +03:00
5361a94c57 nodejs: wopi CopyPasteRestrictions for anonymous v99.99.99.4453 v99.99.99.4452 v99.99.99.4448 v99.99.99.4447 v99.99.99.4446 v99.99.99.4449 v99.99.99.4455 v99.99.99.4454 v99.99.99.4450 v99.99.99.4451 2025-11-27 17:54:43 +03:00
33ad23a08c nodejs: get fileType 2025-11-25 18:42:56 +03:00
e28f8df721 Merge remote-tracking branch 'remotes/origin/release/1.15.0' into develop v99.99.99.4440 v99.99.99.4438 v99.99.99.4439 v99.99.99.4437 v99.99.99.4436 v99.99.99.4435 v99.99.99.4434 2025-11-21 16:58:54 +03:00
4096952ed1 ruby: delete 3rd licenses v9.3.0.17 v9.3.0.36 v9.3.0.6 v9.3.0.52 v9.3.0.51 v9.3.0.5 v9.3.0.49 v9.3.0.48 v9.3.0.47 v9.3.0.45 v9.3.0.44 v9.3.0.41 v9.3.0.40 v9.3.0.4 v9.3.0.35 v9.3.0.34 v9.3.0.33 v9.3.0.32 v9.3.0.31 v9.3.0.30 v9.3.0.3 v9.3.0.29 v9.3.0.28 v9.3.0.27 v9.3.0.26 v9.3.0.25 v9.3.0.24 v9.3.0.23 v9.3.0.22 v9.3.0.2 v9.3.0.16 v9.3.0.15 v9.3.0.14 v9.3.0.13 v9.3.0.12 v9.3.0.10 v9.3.0.1 2025-11-21 16:58:40 +03:00
464f2ff503 Merge branch 'release/1.15.0' into develop 2025-11-21 16:54:34 +03:00
c973d1e8d5 Merge remote-tracking branch 'remotes/origin/master' into release/1.15.0
# Conflicts:
#	3rd-Party.license
#	web/documentserver-example/ruby/3rd-Party.license
#	web/documentserver-example/ruby/licenses/3rd-Party.license
2025-11-21 16:54:09 +03:00
73179240eb Merge pull request 'ci/git-actions' from ci/git-actions into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/83
v9.2.0.100 v9.2.1.1 v9.2.1.6 v9.2.1.7 v9.2.1.8 v9.2.1.9 v9.2.1.4 v9.2.1.2 v9.2.1.13 v9.2.1.12 v9.2.1.11 v9.2.1.10 v9.2.1.43 v9.2.0.101 v9.2.0.98 v9.2.0.97 v9.2.0.96 v9.2.0.94 v9.2.0.92 v9.2.0.90 v9.2.0.89 v9.2.0.88 v9.2.0.119 v9.2.0.103 v9.2.1.5 v9.2.0.102 v9.4.0.1 v9.4.0.2 v9.4.0.3 v9.3.1.1 v9.3.1.5 v9.3.1.4 v9.3.1.6 v9.3.1.7 v9.3.1.8 v9.3.1.9
2025-11-21 13:50:35 +00:00
63dc3304d8 delete: 3rd-Party.license 2025-11-14 16:37:05 +03:00
2044f4665c ci: added licenses-spring.yml 2025-11-14 16:36:57 +03:00
ad88d970c2 ci: added licenses-ruby.yml 2025-11-14 16:35:52 +03:00
2728a61653 ci: added licenses-python.yml 2025-11-14 16:34:35 +03:00
6bf436c506 ci: added licenses-php-laravel.yml 2025-11-14 16:33:13 +03:00
837f89feea ci: added licenses-php.yml 2025-11-14 16:33:07 +03:00
1189440dae ci: added licenses-nodejs.yml 2025-11-14 16:33:01 +03:00
8183e7e85b ci: added licenses-java.yml 2025-11-14 16:32:34 +03:00
c65164f34e ci: added licenses-go.yml 2025-11-14 16:32:21 +03:00