Commit Graph

4772 Commits

Author SHA1 Message Date
598e914452 Merge pull request 'feature/diagrams' from feature/diagrams-editor into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/33
v99.99.99.4137 v99.99.99.4136 v99.99.99.4138
2025-02-11 15:19:08 +00:00
099a53b24b Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor
# Conflicts:
#	.gitmodules
#	CHANGELOG.md
2025-02-11 18:14:51 +03:00
d01263917c nodejs: vsdx 2025-02-11 18:14:00 +03:00
f57fa79ce2 1.13.0 2025-02-11 18:09:50 +03:00
19f01e6078 java: support pages, numbers, key formats 2025-02-11 12:55:46 +03:00
0f3c40e0b1 update diagram tab icon 2025-02-11 16:42:41 +07:00
8eb0c3d5e5 Merge pull request 'update-tab-icons' from update-tab-icons into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/42
2025-02-11 09:41:25 +00:00
3ab2e9843d php-laravel: update tab icons 2025-02-11 16:35:51 +07:00
e3a46bf88f go: update tab icons 2025-02-11 16:35:00 +07:00
47c015ec3f Merge pull request '1.12.0 update tab icons' from 1.12-icons-update into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/40
2025-02-11 09:04:02 +00:00
b4461b4424 ruby: update tab icons 2025-02-11 11:51:12 +07:00
abd337285e python: update tab icons 2025-02-11 11:50:31 +07:00
9863dc4641 php: update tab icons 2025-02-11 11:49:38 +07:00
f6fb3acb52 nodejs: update tab icons 2025-02-11 11:48:50 +07:00
e67f46c67f java-spring: update tab icons 2025-02-11 11:48:18 +07:00
20fab05971 java: update tab icons 2025-02-11 11:47:36 +07:00
f872b50f5b csharp-mvc: update tab icons 2025-02-11 11:45:06 +07:00
f32e8409e5 csharp: update tab icons 2025-02-11 11:43:54 +07:00
e2777b614b Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
v99.99.99.4135
2025-02-10 10:42:44 +03:00
a091891573 Merge pull request 'fix(java-spring): correct document icon name. Fix Bug 73118' from fix/java-spring-document-icon into release/1.12.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/39
2025-02-10 07:41:44 +00:00
e14be1b9c9 fix(java-spring): correct document icon name. Fix Bug 73118 2025-02-10 14:25:33 +07:00
1fe19724c2 nodejs: Updated dependencies and fixed vulnerabilities 2025-02-10 10:14:29 +03:00
40e27137ed Merge pull request 'feat(nodejs): rename in wopi' from feature/wopi-rename into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/37
2025-02-10 06:54:59 +00:00
11f335afc3 Merge remote-tracking branch 'remotes/origin/develop' into feature/wopi-rename
# Conflicts:
#	CHANGELOG.md
2025-02-10 09:53:57 +03:00
355c5c4ed1 feat(nodejs): rename in wopi 2025-02-10 13:03:11 +07:00
27456a308d Merge pull request 'style(nodejs): move mobile editor icon' from move-mobile-editor-icon into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/38
v99.99.99.4132 v99.99.99.4133 v99.99.99.4134
2025-02-07 09:57:39 +00:00
6e0f2e35f4 Merge pull request 'feature/on-user-action-required' from feature/on-user-action-required into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/36
2025-02-07 09:48:38 +00:00
27b63833c3 Merge remote-tracking branch 'remotes/origin/develop' into feature/on-user-action-required
# Conflicts:
#	CHANGELOG.md
2025-02-07 12:41:35 +03:00
0f895e7b38 nodejs: wopi favicon to changelog 2025-02-07 12:40:17 +03:00
81679f35a1 Merge pull request 'feat(nodejs): use favIconUrl in wopi' from wopi-faviconurl into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/35
2025-02-07 09:37:31 +00:00
3301421663 clean file 2025-02-07 12:29:54 +03:00
bf2f32b7cb Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/assets/document-formats
#	web/documentserver-example/csharp/assets/document-formats
#	web/documentserver-example/go/static/assets/document-formats
#	web/documentserver-example/java/src/main/resources/assets/document-formats
#	web/documentserver-example/php/assets/document-formats
#	web/documentserver-example/python/assets/document-formats
#	web/documentserver-example/ruby/assets/document-formats
2025-02-07 11:59:22 +03:00
13d5d38abc support hwp, hwpx, pages, numbers, key formats 2025-02-07 11:54:56 +03:00
5c3047850b style(nodejs): move mobile editor icon 2025-02-07 11:40:39 +07:00
ed1759181a update submodules v99.99.99.4131 2025-02-06 18:24:39 +03:00
28ed07733a Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-02-06 18:22:44 +03:00
d4aaa38414 nodejs: update submodule v8.3.0.98 2025-02-06 18:19:54 +03:00
a53fa55a89 feat(ruby): onUserActionRequired 2025-02-06 15:29:19 +07:00
9d05480f5e feat(python): onUserActionRequired 2025-02-06 15:28:03 +07:00
edd7e8476f feat(php-laravel): onUserActionRequired 2025-02-06 15:27:17 +07:00
310d12d40a feat(php): onUserActionRequired 2025-02-06 15:25:53 +07:00
0c9d03b3f0 feat(java-spring): onUserActionRequired 2025-02-06 15:24:10 +07:00
7935998094 feat(java): onUserActionRequired 2025-02-06 15:22:40 +07:00
b355e1fa0b feat(go): onUserActionRequired 2025-02-06 15:18:53 +07:00
31e9c5380f feat(csharp-mvc): onUserActionRequired 2025-02-06 15:15:13 +07:00
5ea1eb6995 feat(csharp): onUserActionRequired 2025-02-06 15:09:45 +07:00
a1243c2ba1 feat(nodejs): onUserActionRequired 2025-02-06 15:07:33 +07:00
e1409966bd feat(nodejs): use favIconUrl in wopi 2025-02-06 14:54:38 +07:00
fad5afb32d Merge branch 'release/1.12.0' into develop v99.99.99.4130 2025-02-05 14:30:17 +03:00
40c1856315 java-spring: sdk 1.2.1 ( Fix Bug 73107 ) v8.3.0.94 v8.3.0.97 2025-02-05 14:29:40 +03:00