|
|
345e272cbb
|
Merge remote-tracking branch 'remotes/origin/release/v9.0.0' into develop
# Conflicts:
# CHANGELOG.md
|
2025-04-14 13:33:50 +03:00 |
|
|
|
f5e279ca11
|
change preload address
|
2025-04-14 13:22:17 +03:00 |
|
|
|
f40f1a4704
|
fix text
|
2025-03-24 13:06:13 +03:00 |
|
|
|
5c0c2f7baa
|
Merge remote-tracking branch 'remotes/origin/develop' into features-tips
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# web/documentserver-example/go/server/managers/default/user.go
# web/documentserver-example/java-spring/pom.xml
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/nodejs/helpers/users.js
# web/documentserver-example/php-laravel/app/Repositories/UserRepository.php
# web/documentserver-example/php/src/helpers/ExampleUsers.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2025-03-24 12:46:19 +03:00 |
|
|
|
39a32011f8
|
Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop
|
2025-03-19 11:46:53 +03:00 |
|
|
|
5cbb905285
|
refactoring
|
2025-03-19 11:44:07 +03:00 |
|
|
|
806fee40dd
|
fix(java): correct file name for conversion instead of changing download link
|
2025-03-19 15:27:35 +07:00 |
|
|
|
a16318fa71
|
fix(java): correct version author when changes exist. Fix Bug 73505
|
2025-03-19 15:27:34 +07:00 |
|
|
|
248ca25671
|
fix(java): sort files by modification time. Fix Bug 73528
|
2025-03-19 15:27:04 +07:00 |
|
|
|
6cbe243baa
|
fix: reloading page after upload(java, java-spring). Fix Bug 73527
|
2025-03-19 15:27:03 +07:00 |
|
|
|
938212cb6a
|
first user with favorite option
|
2025-03-17 16:12:41 +03:00 |
|
|
|
267e14edde
|
reorder user's info
|
2025-03-17 15:59:31 +03:00 |
|
|
|
4d7fe321ba
|
feat(java): enable features tips for anonymous
|
2025-03-03 14:13:25 +07:00 |
|
|
|
d6d9ea024c
|
Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop
|
2025-02-24 17:21:00 +03:00 |
|
|
|
7ea4545657
|
feat(java): add jwt token lifetime from config
|
2025-02-24 17:18:51 +03:00 |
|
|
|
ed0a70f071
|
Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop
|
2025-02-20 13:18:39 +03:00 |
|
|
|
00506049aa
|
fix(java): support for mobile screens with width less than 320px
|
2025-02-20 13:16:43 +03: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 |
|
|
|
f57fa79ce2
|
1.13.0
|
2025-02-11 18:09:50 +03:00 |
|
|
|
0f3c40e0b1
|
update diagram tab icon
|
2025-02-11 16:42:41 +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 |
|
|
|
20fab05971
|
java: update tab icons
|
2025-02-11 11:47:36 +07: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 |
|
|
|
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 |
|
|
|
ed1759181a
|
update submodules
|
2025-02-06 18:24:39 +03:00 |
|
|
|
7935998094
|
feat(java): onUserActionRequired
|
2025-02-06 15:22:40 +07:00 |
|
|
|
ca7fb41089
|
Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
|
2025-02-04 18:00:39 +03:00 |
|
|
|
4c609a4ef4
|
docs(java): 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 |
|
|
|
a3d7b159da
|
feat(java): support vsdx in diagram editor
|
2025-02-04 15:03:07 +07: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 |
|
|
|
c0a5772226
|
fix(java): update tab icons
|
2025-01-27 15:07:35 +07:00 |
|
|
|
a0da50d123
|
feat: add kurdish language
|
2025-01-27 13:58:41 +07:00 |
|
|
|
a62ae98b0e
|
feat(java): restore file by url
|
2025-01-27 12:55:47 +07:00 |
|
|
|
2f8306e725
|
update submodules
|
2025-01-21 15:27:03 +03:00 |
|
|
|
f715ed454d
|
sq-AL skin language
|
2025-01-10 16:33:00 +03:00 |
|
|
|
3e4b1b509b
|
feat(java): refresh file config
|
2024-12-13 14:14:44 +07:00 |
|
|
|
3186245cc8
|
update file type icons
|
2024-11-26 17:19:28 +03:00 |
|
|
|
524bd4951a
|
xml with -9 to changelog
|
2024-11-21 17:07:46 +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 |
|
