mirror of
https://github.com/ONLYOFFICE/document-server-integration.git
synced 2026-02-10 18:05:10 +08:00
729065fed0
# 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
59 lines
3.2 KiB
Plaintext
59 lines
3.2 KiB
Plaintext
[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
|
|
path = web/documentserver-example/nodejs/public/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
|
|
path = web/documentserver-example/nodejs/public/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
branch = feature/v8.0
|
|
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
|
|
path = web/documentserver-example/csharp-mvc/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
|
|
path = web/documentserver-example/csharp-mvc/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
[submodule "web/documentserver-example/php/assets/document-templates"]
|
|
path = web/documentserver-example/php/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/php/assets/document-formats"]
|
|
path = web/documentserver-example/php/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
branch = master
|
|
[submodule "web/documentserver-example/python/assets/document-templates"]
|
|
path = web/documentserver-example/python/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
|
|
path = web/documentserver-example/java/src/main/resources/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/ruby/assets/document-templates"]
|
|
path = web/documentserver-example/ruby/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
|
|
path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/python/assets/document-formats"]
|
|
path = web/documentserver-example/python/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
branch = master
|
|
[submodule "web/documentserver-example/ruby/assets/document-formats"]
|
|
path = web/documentserver-example/ruby/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
branch = master
|
|
[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
|
|
path = web/documentserver-example/java/src/main/resources/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|
|
branch = master
|
|
[submodule "web/documentserver-example/csharp/assets/document-templates"]
|
|
path = web/documentserver-example/csharp/assets/document-templates
|
|
url = https://github.com/ONLYOFFICE/document-templates
|
|
branch = main/en
|
|
[submodule "web/documentserver-example/csharp/assets/document-formats"]
|
|
path = web/documentserver-example/csharp/assets/document-formats
|
|
url = https://github.com/ONLYOFFICE/document-formats
|