|
|
ca7fb41089
|
Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
|
2025-02-04 18:00:39 +03:00 |
|
|
|
314deba650
|
docs(java-spring): configure jwt
|
2025-02-04 17:57:50 +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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
b7d863b0e1
|
Revert "feat: add kurdish language"
This reverts commit a0da50d123.
# Conflicts:
# CHANGELOG.md
|
2025-01-29 14:14:29 +03: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
|
2025-01-27 10:04:38 +00:00 |
|
|
|
eac01bfc61
|
update copyright 2025
|
2025-01-27 15:52:48 +07: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 |
|
|
|
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 |
|
|
|
3d6c4bafb2
|
fix(java-spring): update tab icons
|
2025-01-27 15:08:34 +07:00 |
|
|
|
a0da50d123
|
feat: add kurdish language
|
2025-01-27 13:58:41 +07:00 |
|
|
|
1b03eb30cb
|
feat(java-spring): restore file by url
|
2025-01-27 12:55:47 +07:00 |
|
|
|
d052523451
|
fix(java-spring): reading changes.json with utf-8 encoding
|
2025-01-27 12:55:47 +07:00 |
|
|
|
f715ed454d
|
sq-AL skin language
|
2025-01-10 16:33:00 +03:00 |
|
|
|
3383a00ad0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/refresh-file
|
2024-12-16 10:23:38 +03:00 |
|
|
|
cf90c42605
|
feat: delete model common/Changes from docs-integration-sdk
|
2024-12-16 10:20:08 +03:00 |
|
|
|
ec25b8a355
|
feat: migrate to httpclient5
|
2024-12-16 10:18:21 +03:00 |
|
|
|
eada50a422
|
feat: com.onlyoffice.docs-integration-sdk:1.3.1-SNAPSHOT
|
2024-12-16 10:17:11 +03:00 |
|
|
|
6511fbbf55
|
feat(java-spring): refresh file config
|
2024-12-13 14:14:44 +07:00 |
|
|
|
3186245cc8
|
update file type icons
|
2024-11-26 17:19:28 +03:00 |
|
|
|
9a189b06ee
|
Merge remote-tracking branch 'remotes/origin/develop' into force-conversion-correct-formats
|
2024-11-21 17:05:25 +03:00 |
|
|
|
cd4afd7131
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/convert-button
|
2024-11-21 16:44:25 +03:00 |
|
|
|
4dc13cc102
|
update file type icons
|
2024-11-21 16:25:30 +03:00 |
|
|
|
02adb6cdca
|
copyright to forgotten
|
2024-11-21 13:14:37 +03:00 |
|
|
|
c2153c48c5
|
fix(java-spring): available formats for forced conversion
|
2024-11-21 13:12:26 +07:00 |
|
|
|
5dc7ffdecd
|
update submodules
|
2024-11-08 17:13:49 +03:00 |
|
|
|
3fda69efc8
|
feat(java-spring): convert button
|
2024-10-30 16:32:34 +07:00 |
|
|
|
9aca7a2b52
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/on-request-reference-source
# Conflicts:
# CHANGELOG.md
|
2024-10-21 14:37:46 +03:00 |
|
|
|
b1fd32a0f6
|
Merge remote-tracking branch 'remotes/origin/release/v1.11.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-10-20 17:14:02 +03:00 |
|
|
|
decb722cf9
|
1.11.0
|
2024-10-20 17:08:13 +03:00 |
|
|
|
011be765ab
|
fix(java-spring): revert filling by default
|
2024-10-16 15:00:21 +07:00 |
|
|
|
17a03eea56
|
Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-10-15 18:29:42 +03:00 |
|
|
|
e4f5f0bca7
|
submit not for viewer
This reverts commit 35cf2fb0b0.
|
2024-10-15 18:06:37 +03:00 |
|
|
|
93fcf5264d
|
feat(java-spring): onRequestReferenceSource
|
2024-10-15 16:25:30 +07:00 |
|
|
|
70a515f276
|
Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop
|
2024-10-10 13:49:08 +03:00 |
|
|
|
abb7f6e893
|
Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0
|
2024-10-10 13:47:38 +03:00 |
|
|
|
05f7fa2b84
|
fix(java-spring): error saving non-existent file. Fix Bug 70788
|
2024-10-10 17:11:48 +07:00 |
|
|
|
a942265f63
|
feat(java-spring): close editor. Fix Bug 69915
|
2024-10-10 15:54:30 +07:00 |
|
|
|
eba8bce11b
|
Merge pull request 'feature/filename-title' from feature/filename-title into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/6
|
2024-10-08 15:15:05 +00:00 |
|
|
|
06c3dc1446
|
Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0
|
2024-10-08 12:54:10 +03:00 |
|
|
|
35cf2fb0b0
|
submit for all modes
|
2024-10-07 14:54:16 +03:00 |
|
|
|
8e8593d7c1
|
feat(java-spring): filename in editor page title
|
2024-10-07 16:13:34 +07:00 |
|
|
|
17458ec5b3
|
fix(java-spring): сut out directUrl. Fix Bug 70571
|
2024-10-07 14:42:24 +07:00 |
|
|
|
50bbd86cf5
|
Merge branch 'release/v1.10.0' into release/v8.2.0
|
2024-09-30 12:52:43 +03:00 |
|
|
|
2b0b902f9c
|
using default empty files (For Bug 70101)
|
2024-09-30 12:50:09 +03:00 |
|
|
|
596d445439
|
revert empty files (For Bug 70101)
|
2024-09-24 15:06:16 +03:00 |
|
|
|
4c7ea51207
|
Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0
|
2024-09-24 12:02:52 +03:00 |
|
