|
|
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 |
|
|
|
13d5d38abc
|
support hwp, hwpx, pages, numbers, key formats
|
2025-02-07 11:54:56 +03: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 |
|
|
|
b64772de74
|
Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
# web/documentserver-example/java-spring/pom.xml
|
2025-02-05 11:16:19 +03:00 |
|
|
|
bc67af0fa4
|
java-spring: sdk 1.3.1-SNAPSHOT ( Fix Bug 73107 )
v8.3.0.93
|
2025-02-05 11:15:26 +03:00 |
|
|
|
ca7fb41089
|
Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
v99.99.99.4129
|
2025-02-04 18:00:39 +03:00 |
|
|
|
f0b752fe2f
|
docs(go): configure jwt
|
2025-02-04 18:00:21 +03:00 |
|
|
|
da6a0e9c3c
|
Merge pull request 'jwt-in-readme' from jwt-in-readme into release/1.12.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/32
v8.3.0.92
|
2025-02-04 14:59:57 +00:00 |
|
|
|
40c22da401
|
nodejs: configure jwt
|
2025-02-04 17:58:11 +03:00 |
|
|
|
314deba650
|
docs(java-spring): configure jwt
|
2025-02-04 17:57:50 +03:00 |
|
|
|
4c609a4ef4
|
docs(java): configure jwt
|
2025-02-04 17:57:50 +03:00 |
|
|
|
679adb3336
|
docs(csharp-mvc): configure jwt
|
2025-02-04 17:57:25 +03:00 |
|
|
|
f314212341
|
docs(csharp): configure jwt
|
2025-02-04 17:57:24 +03:00 |
|
|
|
acc67c0c5a
|
update tab icons
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/29
# Conflicts:
# web/documentserver-example/go/static/images/cell.ico
# web/documentserver-example/go/static/images/slide.ico
# web/documentserver-example/go/static/images/word.ico
# web/documentserver-example/php-laravel/public/images/cell.ico
# web/documentserver-example/php-laravel/public/images/slide.ico
# web/documentserver-example/php-laravel/public/images/word.ico
|
2025-02-04 17:51:10 +03:00 |
|
|
|
3e6a8e2a92
|
Merge branch 'release/v8.3.0' into develop
v99.99.99.4128
|
2025-02-03 16:33:02 +03:00 |
|
|
|
343705c4bd
|
fix(nodejs): update tab icons
v8.3.0.91
v8.3.0.89
|
2025-02-03 16:31:52 +03:00 |
|
|
|
db30f43119
|
update file type icons
# Conflicts:
# web/documentserver-example/csharp-mvc/Content/images/file_docx.svg
# web/documentserver-example/csharp-mvc/Content/images/file_pdf.svg
# web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg
# web/documentserver-example/csharp-mvc/Content/images/file_upload.svg
# web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg
# web/documentserver-example/csharp-mvc/Content/images/icon_docx.svg
# web/documentserver-example/csharp-mvc/Content/images/icon_pdf.svg
# web/documentserver-example/csharp-mvc/Content/images/icon_pptx.svg
# web/documentserver-example/csharp-mvc/Content/images/icon_xlsx.svg
# web/documentserver-example/csharp/App_Themes/images/file_docx.svg
# web/documentserver-example/csharp/App_Themes/images/file_pdf.svg
# web/documentserver-example/csharp/App_Themes/images/file_pptx.svg
# web/documentserver-example/csharp/App_Themes/images/file_upload.svg
# web/documentserver-example/csharp/App_Themes/images/file_xlsx.svg
# web/documentserver-example/csharp/App_Themes/images/icon_docx.svg
# web/documentserver-example/csharp/App_Themes/images/icon_pdf.svg
# web/documentserver-example/csharp/App_Themes/images/icon_pptx.svg
# web/documentserver-example/csharp/App_Themes/images/icon_xlsx.svg
# web/documentserver-example/go/static/images/file_docx.svg
# web/documentserver-example/go/static/images/file_pdf.svg
# web/documentserver-example/go/static/images/file_pptx.svg
# web/documentserver-example/go/static/images/file_upload.svg
# web/documentserver-example/go/static/images/file_xlsx.svg
# web/documentserver-example/go/static/images/icon_docx.svg
# web/documentserver-example/go/static/images/icon_pdf.svg
# web/documentserver-example/go/static/images/icon_pptx.svg
# web/documentserver-example/go/static/images/icon_xlsx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pdf.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pptx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/file_upload.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/file_xlsx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_docx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pdf.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pptx.svg
# web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_xlsx.svg
# web/documentserver-example/java/src/main/webapp/css/img/file_docx.svg
# web/documentserver-example/java/src/main/webapp/css/img/file_pdf.svg
# web/documentserver-example/java/src/main/webapp/css/img/file_pptx.svg
# web/documentserver-example/java/src/main/webapp/css/img/file_upload.svg
# web/documentserver-example/java/src/main/webapp/css/img/file_xlsx.svg
# web/documentserver-example/java/src/main/webapp/css/img/icon_docx.svg
# web/documentserver-example/java/src/main/webapp/css/img/icon_pdf.svg
# web/documentserver-example/java/src/main/webapp/css/img/icon_pptx.svg
# web/documentserver-example/java/src/main/webapp/css/img/icon_xlsx.svg
# web/documentserver-example/nodejs/public/images/file_docx.svg
# web/documentserver-example/nodejs/public/images/file_pdf.svg
# web/documentserver-example/nodejs/public/images/file_pptx.svg
# web/documentserver-example/nodejs/public/images/file_upload.svg
# web/documentserver-example/nodejs/public/images/file_xlsx.svg
# web/documentserver-example/nodejs/public/images/icon_docx.svg
# web/documentserver-example/nodejs/public/images/icon_pdf.svg
# web/documentserver-example/nodejs/public/images/icon_pptx.svg
# web/documentserver-example/nodejs/public/images/icon_xlsx.svg
# web/documentserver-example/php-laravel/public/images/file_docx.svg
# web/documentserver-example/php-laravel/public/images/file_pdf.svg
# web/documentserver-example/php-laravel/public/images/file_pptx.svg
# web/documentserver-example/php-laravel/public/images/file_upload.svg
# web/documentserver-example/php-laravel/public/images/file_xlsx.svg
# web/documentserver-example/php-laravel/public/images/icon_docx.svg
# web/documentserver-example/php-laravel/public/images/icon_pdf.svg
# web/documentserver-example/php-laravel/public/images/icon_pptx.svg
# web/documentserver-example/php-laravel/public/images/icon_xlsx.svg
# web/documentserver-example/php/assets/images/file_docx.svg
# web/documentserver-example/php/assets/images/file_pdf.svg
# web/documentserver-example/php/assets/images/file_pptx.svg
# web/documentserver-example/php/assets/images/file_upload.svg
# web/documentserver-example/php/assets/images/file_xlsx.svg
# web/documentserver-example/php/assets/images/icon_docx.svg
# web/documentserver-example/php/assets/images/icon_pdf.svg
# web/documentserver-example/php/assets/images/icon_pptx.svg
# web/documentserver-example/php/assets/images/icon_xlsx.svg
# web/documentserver-example/python/static/images/file_docx.svg
# web/documentserver-example/python/static/images/file_pdf.svg
# web/documentserver-example/python/static/images/file_pptx.svg
# web/documentserver-example/python/static/images/file_upload.svg
# web/documentserver-example/python/static/images/file_xlsx.svg
# web/documentserver-example/python/static/images/icon_docx.svg
# web/documentserver-example/python/static/images/icon_pdf.svg
# web/documentserver-example/python/static/images/icon_pptx.svg
# web/documentserver-example/python/static/images/icon_xlsx.svg
# web/documentserver-example/ruby/app/assets/images/file_docx.svg
# web/documentserver-example/ruby/app/assets/images/file_pdf.svg
# web/documentserver-example/ruby/app/assets/images/file_pptx.svg
# web/documentserver-example/ruby/app/assets/images/file_upload.svg
# web/documentserver-example/ruby/app/assets/images/file_xlsx.svg
# web/documentserver-example/ruby/app/assets/images/icon_docx.svg
# web/documentserver-example/ruby/app/assets/images/icon_pdf.svg
# web/documentserver-example/ruby/app/assets/images/icon_pptx.svg
# web/documentserver-example/ruby/app/assets/images/icon_xlsx.svg
|
2025-02-03 16:31:52 +03:00 |
|
|
|
b759c8ba53
|
nodejs: interactive-widget=resizes-content ( Fix Bug 72802 )
|
2025-02-03 15:07:07 +03:00 |
|
|
|
d7f45cc7a9
|
Merge pull request 'feature/php-laravel-sdk-integration' from feature/php-laravel-sdk-integration into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/25
Reviewed-by: Stepan Mayorov <stepan.mayorov@onlyoffice.com>
Reviewed-by: Alexander Kondratev <aleksandr.kondratyev@onlyoffice.com>
v99.99.99.4127
v99.99.99.4125
v99.99.99.4126
|
2025-01-31 12:02:28 +00:00 |
|
|
|
57b3641647
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/php-laravel-sdk-integration
# Conflicts:
# CHANGELOG.md
|
2025-01-31 15:01:35 +03:00 |
|
|
|
41fd4d9e92
|
Merge branch 'release/v8.3.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/public/assets/document-formats
# web/documentserver-example/nodejs/views/editor.ejs
|
2025-01-31 13:37:58 +03:00 |
|
|
|
ad3e6bbe15
|
1.12.0
v8.3.0.88
v8.3.0.86
v8.3.0.87
|
2025-01-31 13:34:00 +03:00 |
|
|
|
76c7e10993
|
sq-AL skin language
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/go/config/configuration.json
# web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php
|
2025-01-31 13:11:06 +03:00 |
|
|
|
f023a9defd
|
nodejs: support hwp, hwps formats
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/public/assets/document-formats
|
2025-01-31 12:20:11 +03:00 |
|
|
|
e9cd5e30fb
|
nodejs: support pages, numbers, key formats
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/public/assets/document-formats
|
2025-01-31 12:20:11 +03:00 |
|
|
|
85bf35f50a
|
nodejs: refresh file config
# Conflicts:
# CHANGELOG.md
|
2025-01-31 12:20:03 +03:00 |
|
|
|
383e2dcaba
|
fix changelog
|
2025-01-31 11:52:37 +03:00 |
|
|
|
b7d863b0e1
|
Revert "feat: add kurdish language"
This reverts commit a0da50d123.
# Conflicts:
# CHANGELOG.md
v99.99.99.4124
v8.3.0.85
v99.99.99.4123
v8.3.0.84
|
2025-01-29 14:14:29 +03:00 |
|
|
|
d79c1d35b2
|
Merge branch 'develop' into feature/php-laravel-sdk-integration
|
2025-01-27 15:56:11 +05:00 |
|
|
|
66f1233c16
|
Merge pull request 'update copyright 2025' from copyright-2025 into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/30
v8.3.0.82
v99.99.99.4121
v99.99.99.4122
v8.3.0.83
|
2025-01-27 10:04:38 +00:00 |
|
|
|
eac01bfc61
|
update copyright 2025
|
2025-01-27 15:52:48 +07:00 |
|