|
|
afd5a88b1d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/docs-integration-sdk
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
|
2024-04-03 15:16:19 +03:00 |
|
|
|
57ca15153f
|
Merge pull request #551 from ONLYOFFICE/feature/fetching-formats
Feature/fetching formats
|
2024-04-03 12:31:53 +03:00 |
|
|
|
a0ce620f84
|
build: use com.onlyoffice:docs-integration-sdk from maven
|
2024-04-02 16:36:50 +03:00 |
|
|
|
cc3c640868
|
refactor: merge format and format-manager files into formats file
|
2024-04-01 12:21:18 +05:00 |
|
|
|
1df3c046ee
|
docs: license 2024
|
2024-03-29 10:27:50 +03:00 |
|
|
|
1f2623dc07
|
refactor: settings for connect doc-server to application.properties
|
2024-03-29 10:19:39 +03:00 |
|
|
|
317018df5b
|
fix: convert file after upload
|
2024-03-29 09:54:19 +03:00 |
|
|
|
729065fed0
|
Merge branch 'develop' into feature/docs-integration-sdk
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/Callback.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/CallbackHandler.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/Status.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/EditCallback.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/ForcesaveCallback.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/SaveCallback.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DocumentManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/DefaultJwtManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/JwtManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/template/SampleTemplateManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/template/TemplateManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/AbstractModel.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/Format.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Embedded.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Goback.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Info.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/ConvertErrorType.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Mode.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/ToolbarDocked.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Type.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/CommentGroup.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Document.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/EditorConfig.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/FileModel.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Permission.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/ReferenceData.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Template.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/SSLUtils.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultFormatService.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/ServiceConverter.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Action.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesHistory.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesUser.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Convert.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ConvertedData.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/History.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/AbstractMapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/Mapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/PermissionsMapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/UsersMapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/Configurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/CustomizationConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/DocumentConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/EditorConfigConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/EmbeddedConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/FileConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEmbeddedConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultDocumentWrapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultEmbeddedWrapper.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
# web/documentserver-example/java-spring/src/main/resources/assets/document-formats
|
2024-03-28 17:17:16 +03:00 |
|
|
|
248595472d
|
build: docs-integration-sdk-1.1.3-SNAPSHOT.jar
|
2024-03-28 15:19:18 +03:00 |
|
|
|
ead7e8de06
|
fix: condition upload file
|
2024-03-28 15:18:43 +03:00 |
|
|
|
f1f834fb0c
|
refactor: create and use new method for finding formats by extension
|
2024-03-26 17:57:52 +05:00 |
|
|
|
acb9a0e4c9
|
refactor(java-spring): add formatslist dto object and replace jsonobject with it
|
2024-03-25 12:51:13 +05:00 |
|
|
|
6d28e3f8d8
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-03-21 14:23:41 +03:00 |
|
|
|
0414319893
|
nodejs: fill permission in embedded mode
|
2024-03-21 14:05:31 +03:00 |
|
|
|
f3b35a878c
|
refactor(java-spring): move formats method to indexcontroller and change return type to responseentity
|
2024-03-21 13:23:31 +05:00 |
|
|
|
0a61708f67
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
# CHANGELOG.md
|
2024-03-20 10:58:41 +03:00 |
|
|
|
389198aec6
|
Merge pull request #544 from ONLYOFFICE/feature/auto-conversion-error
Feature/auto conversion error
|
2024-03-20 10:02:53 +03:00 |
|
|
|
426b15b8f1
|
Merge remote-tracking branch 'origin/develop' into feature/fetching-formats
|
2024-03-19 13:01:48 +05:00 |
|
|
|
c4980c19e7
|
Revert "docxf and oform since v7.0"
This reverts commit beb9885b03.
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2024-03-18 18:24:47 +03:00 |
|
|
|
80291baa40
|
goback: change state for users (408d80fff6)
|
2024-03-18 14:21:12 +03:00 |
|
|
|
47f4f022aa
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
# CHANGELOG.md
|
2024-03-15 16:48:58 +03:00 |
|
|
|
8c8d14b48c
|
refactor(java-spring): change formats retrieval method on frontend
|
2024-03-15 15:50:14 +05:00 |
|
|
|
b1d66e16a5
|
feat(java-spring): handling auto-conversion error(-9)
|
2024-03-13 15:38:24 +05:00 |
|
|
|
c1da8e14c3
|
feat(java-spring): implement delete all files method
|
2024-03-06 14:41:29 +05:00 |
|
|
|
423233e93f
|
update submodule
|
2024-03-05 16:42:41 +03:00 |
|
|
|
690ab5471b
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-28 17:40:09 +03:00 |
|
|
|
3e6bee4cc1
|
fix(java-spring): empty strings as null in json deserialization. fix bug 66552
|
2024-02-27 15:14:16 +07:00 |
|
|
|
3eac4912e1
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-14 22:19:11 +03:00 |
|
|
|
283139450c
|
Form template rename as PDF form
|
2024-02-14 16:45:07 +03:00 |
|
|
|
18fd30700f
|
copyright 2024
|
2024-02-09 12:22:50 +03:00 |
|
|
|
9721187083
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-09 12:21:37 +03:00 |
|
|
|
bce5e3760a
|
do not convert to oform
|
2024-02-09 12:21:24 +03:00 |
|
|
|
b3d3b81274
|
copyright 2024
|
2024-02-01 12:39:36 +03:00 |
|
|
|
dab4841c1d
|
inserting svg
|
2024-02-01 12:35:46 +03:00 |
|
|
|
a7cf7ae378
|
Merge branch 'release/1.8.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-01-30 18:12:51 +03:00 |
|
|
|
0bcd7088e6
|
1.8.0
|
2024-01-30 18:11:47 +03:00 |
|
|
|
319a689fe2
|
nodejs: filling pdf
|
2024-01-30 16:51:02 +03:00 |
|
|
|
3a2f30bfcd
|
Merge branch 'release/v8.0.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/java-spring/src/main/resources/application.properties
# web/documentserver-example/java/src/main/resources/settings.properties
|
2024-01-19 12:27:44 +03:00 |
|
|
|
7423edd7d9
|
ar skin language
|
2024-01-18 17:06:52 +03:00 |
|
|
|
a2c8499622
|
update formats (add missed records)
|
2024-01-10 16:54:20 +03:00 |
|
|
|
1b0e8df99f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
# CHANGELOG.md
|
2024-01-09 11:01:08 +03:00 |
|
|
|
8ba1d5e8d7
|
update formats (add missed records)
|
2023-12-26 12:32:27 +03:00 |
|
|
|
a55d7b2d9d
|
java-spring : add goback user.java
|
2023-12-22 15:08:09 +03:00 |
|
|
|
a763e2b9fe
|
add: using replaceToInnerDocumentServerUrl()
|
2023-12-18 12:57:32 +03:00 |
|
|
|
841a4cd47e
|
delete: SSLUtils
|
2023-12-18 12:52:10 +03:00 |
|
|
|
a5cd051303
|
change: method saveAs in FileController
|
2023-12-18 12:45:19 +03:00 |
|
|
|
381c9d74aa
|
revert: docservice.properties
|
2023-12-18 12:41:58 +03:00 |
|
|
|
154dbb63e9
|
hange: dependency docs-integration-sdk as jar file
|
2023-12-18 12:41:51 +03:00 |
|
|
|
f43e7414bb
|
java-spring: add changes after pr #501
|
2023-12-18 10:09:11 +03:00 |
|
|
|
7b91694107
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-15 18:16:04 +03:00 |
|
