|
|
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 |
|
|
|
bb4e0f2313
|
Merge branch 'feature/restore-by-url' into develop
|
2025-01-27 11:47:45 +03:00 |
|
|
|
b3de340b66
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-by-url
# Conflicts:
# CHANGELOG.md
|
2025-01-27 11:47:12 +03:00 |
|
|
|
74aee6a701
|
Merge branch 'feature/hwp' into develop
|
2025-01-27 11:36:05 +03:00 |
|
|
|
2e3fdf9904
|
Merge pull request 'update tab icons' from update-icons into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/29
|
2025-01-27 08:34:20 +00:00 |
|
|
|
53a4684ece
|
fix changelog
|
2025-01-27 11:31:42 +03:00 |
|
|
|
2bd367e345
|
Merge pull request 'add kurdish language' from feature/kurdish-language into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/28
|
2025-01-27 08:19:56 +00:00 |
|
|
|
afb8ab651c
|
fix(ruby): update tab icons
|
2025-01-27 15:12:25 +07:00 |
|
|
|
06080ee140
|
fix(python): update tab icons
|
2025-01-27 15:11:20 +07:00 |
|
|
|
dfc4d9656f
|
fix(php-laravel): update tab icons
|
2025-01-27 15:10:26 +07:00 |
|
|
|
10a9bbc2ee
|
fix(php): update tab icons
|
2025-01-27 15:09:22 +07:00 |
|
|
|
3d6c4bafb2
|
fix(java-spring): update tab icons
|
2025-01-27 15:08:34 +07:00 |
|
|
|
c0a5772226
|
fix(java): update tab icons
|
2025-01-27 15:07:35 +07:00 |
|
|
|
6e8289cf82
|
fix(go): update tab icons
|
2025-01-27 15:06:26 +07:00 |
|
|
|
5a50742d89
|
fix(csharp-mvc): update tab icons
|
2025-01-27 15:05:45 +07:00 |
|
|
|
d93bdbc50d
|
fix(csharp): update tab icons
|
2025-01-27 15:04:50 +07:00 |
|
|
|
c796f999f1
|
fix(nodejs): update tab icons
|
2025-01-27 15:03:05 +07:00 |
|
|
|
a0da50d123
|
feat: add kurdish language
|
2025-01-27 13:58:41 +07:00 |
|
|
|
6e624a1e2a
|
feat(php-laravel): restore file by url
|
2025-01-27 12:55:48 +07:00 |
|
|
|
63d9a4fb56
|
feat(ruby): restore file by url
|
2025-01-27 12:55:48 +07:00 |
|
|
|
5450a70e8b
|
feat(python): restore file by url
|
2025-01-27 12:55:48 +07:00 |
|
|
|
3016f18654
|
feat(php): restore file by url
|
2025-01-27 12:55:48 +07:00 |
|
|
|
1b03eb30cb
|
feat(java-spring): restore file by url
|
2025-01-27 12:55:47 +07:00 |
|
