|
|
19f01e6078
|
java: support pages, numbers, key formats
|
2025-02-11 12:55:46 +03:00 |
|
|
|
3301421663
|
clean file
|
2025-02-07 12:29:54 +03:00 |
|
|
|
28ed07733a
|
Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
# web/documentserver-example/nodejs/public/assets/document-formats
|
2025-02-06 18:22:44 +03:00 |
|
|
|
d4aaa38414
|
nodejs: update submodule
|
2025-02-06 18:19:54 +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 |
|
|
|
ceaa9d42ed
|
remove redundant document formats submodule
|
2025-01-16 15:40:48 +05:00 |
|
|
|
d090ac039b
|
nodejs: support pages, numbers, key formats
|
2024-11-29 14:46:17 +03:00 |
|
|
|
95cdc163c1
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/golang-update
# Conflicts:
# .gitmodules
# CHANGELOG.md
|
2024-10-07 11:38:47 +03:00 |
|
|
|
cd81f8cd1c
|
feat(go): using default empty files
|
2024-10-07 15:19:20 +07:00 |
|
|
|
a0ddf8d350
|
using default empty files (2b0b902f9c)
|
2024-09-30 12:54:58 +03:00 |
|
|
|
576a234289
|
Merge branch 'release/v8.2.0' into develop
|
2024-09-30 12:53:39 +03:00 |
|
|
|
2b0b902f9c
|
using default empty files (For Bug 70101)
|
2024-09-30 12:50:09 +03:00 |
|
|
|
0a802159f0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/go-lang
# Conflicts:
# CHANGELOG.md
|
2024-09-10 17:20:13 +03:00 |
|
|
|
0786a1c326
|
add submodules
|
2024-07-30 12:08:00 +05:00 |
|
|
|
b91772e7d4
|
Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop
|
2024-06-24 12:34:59 +03:00 |
|
|
|
052f73e47f
|
nodejs: formats v2.0.0
|
2024-06-24 12:32:45 +03:00 |
|
|
|
cfe6db3fd4
|
Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop
|
2024-06-07 12:18:37 +03:00 |
|
|
|
8c44f4a653
|
nodejs: switch back templates branch
|
2024-06-07 12:18:01 +03:00 |
|
|
|
95e7aff092
|
Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/java-spring/src/main/resources/application.properties
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/wopiIndex.ejs
|
2024-06-07 08:49:20 +03:00 |
|
|
|
c3a5c15781
|
feat(go): add document-formats submodule
|
2024-05-14 15:02:42 +07:00 |
|
|
|
7620eb1f8e
|
Merge branch 'develop' into feature/golang-update
|
2024-05-07 14:28:46 +07: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 |
|
|
|
abf382a03b
|
nodejs: creating pdf form
|
2024-03-21 15:03:13 +03:00 |
|
|
|
c15438a0d7
|
nodejs: pdf as new documentType
|
2024-01-30 18:02:12 +03:00 |
|
|
|
11614ca5be
|
delete: gitmodule document-formats
|
2023-12-15 11:16:33 +03:00 |
|
|
|
23d8315c37
|
Merge branch 'develop' into feature/csharp-mvc-matrix-formats
|
2023-11-21 15:56:31 +03:00 |
|
|
|
38aae731ba
|
reorder modules
|
2023-11-21 15:54:33 +03:00 |
|
|
|
6350e33c64
|
csharp-mvc: add document-formats submodule
|
2023-11-10 11:10:06 +03:00 |
|
|
|
0057b81adc
|
csharp-mvc: moved the submodule to the assets/document-templates subfolder
|
2023-11-09 09:56:55 +03:00 |
|
|
|
c91fbf6320
|
csharp: add document-formats submodule
|
2023-11-08 15:24:14 +03:00 |
|
|
|
030985bbeb
|
csharp: moved the submodule to the assets/document-templates subfolder
|
2023-11-08 15:02:58 +03:00 |
|
|
|
df5f311949
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/java-matrix-formats
# Conflicts:
# .gitmodules
# CHANGELOG.md
|
2023-09-14 12:37:01 +03:00 |
|
|
|
fb8f47062c
|
java-spring: added submodule document-formats
|
2023-09-13 15:22:04 +03:00 |
|
|
|
c20687e241
|
java: added submodule document-formats
|
2023-09-12 17:34:46 +03:00 |
|
|
|
5f3b0c61eb
|
java: delete submodule document-formats
|
2023-09-12 17:33:52 +03:00 |
|
|
|
940ea2797e
|
Merge branch 'develop' into feature/java-matrix-formats
# Conflicts:
# .gitmodules
|
2023-09-12 16:39:32 +03:00 |
|
|
|
41a22934a0
|
ruby: add document-formats submodule
|
2023-08-31 11:44:51 +04:00 |
|
|
|
2ffc44f339
|
python: add document-formats submodule
|
2023-08-25 10:06:05 +04:00 |
|
|
|
558c7892d3
|
java: add document-formats submodule
|
2023-08-16 15:21:33 +04:00 |
|
|
|
36cca57dd8
|
java-spring: move document-templates to the assets directory
|
2023-08-15 12:42:48 +04:00 |
|
|
|
d4bed077e0
|
ruby: move document-templates to the assets directory
|
2023-08-14 17:36:24 +04:00 |
|
|
|
85981abd00
|
java: move document-templates to the assets directory
|
2023-08-08 14:47:51 +04:00 |
|
|
|
2d637b88df
|
python: move document-templates to the assets directory
|
2023-07-27 17:10:50 +04:00 |
|
|
|
53f810fc54
|
php: added module document-formats
|
2023-04-27 10:48:48 +03:00 |
|
|
|
a55875ae1e
|
php: added module document-templates
|
2023-04-27 10:46:33 +03:00 |
|
|
|
707a634823
|
php: removed module document-templates
|
2023-04-27 10:42:31 +03:00 |
|
|
|
b511fa872a
|
nodejs: added module document-formats
|
2023-04-27 10:36:56 +03:00 |
|
|
|
4a2e7d9a9e
|
nodejs: added module document-templates
|
2023-04-27 10:32:49 +03:00 |
|
|
|
e4d5de2c0e
|
removed module document-templates
|
2023-04-27 10:24:32 +03:00 |
|
|
|
190f5bba65
|
chore: submodules
|
2023-02-01 13:18:31 +05:00 |
|
