|
|
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 |
|
|
|
6236f90a50
|
Merge pull request #554 from ONLYOFFICE/feature/for-bug-59054
Feature/for bug 59054
v99.99.99.3789
|
2024-03-27 13:00:27 +03:00 |
|
|
|
5118352714
|
nodejs: debug mobile editors opening (Fix Bug 59054)
|
2024-03-27 12:57:58 +03:00 |
|
|
|
aa5a660001
|
nodejs: fix wopi editor size (Fix Bug 59054)
|
2024-03-27 12:57:52 +03:00 |
|
|
|
bf1f987333
|
nodejs: wopi refactoring
|
2024-03-27 12:56:08 +03:00 |
|
|
|
909f638a92
|
Merge pull request #552 from ONLYOFFICE/fix/nodejs-wopi-putfile
fix(nodejs): handle document creation in putFile. Fix Bug 66817
v99.99.99.3784
v99.99.99.3785
v99.99.99.3786
v99.99.99.3787
v99.99.99.3788
|
2024-03-22 10:02:57 +03:00 |
|
|
|
6d28e3f8d8
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
v99.99.99.3783
|
2024-03-21 14:23:41 +03:00 |
|
|
|
1b8f60d5dd
|
nodejs: update formats
|
2024-03-21 14:21:29 +03:00 |
|
|
|
0414319893
|
nodejs: fill permission in embedded mode
|
2024-03-21 14:05:31 +03:00 |
|
|
|
12ad0d9e7e
|
fix(nodejs): handle document creation in putFile. Fix Bug 66817
|
2024-03-21 17:18:58 +07:00 |
|
|
|
c712f596e1
|
Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
v99.99.99.3782
|
2024-03-20 12:52:55 +03:00 |
|
|
|
ad39fb7c19
|
nodejs: wopi formsubmit icon
# Conflicts:
# CHANGELOG.md
v8.1.0.48
|
2024-03-20 12:51:24 +03:00 |
|
|
|
7d2eb086ce
|
Merge pull request #545 from ONLYOFFICE/feature/delete-all-files
Feature/delete all files
|
2024-03-20 11:01:40 +03: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 |
|
|
|
0d302ee8f6
|
nodejs: error message when error:1
v99.99.99.3781
|
2024-03-19 18:06:43 +03:00 |
|
|
|
d3a548bf3f
|
fix(ruby): conversion error code to integer
|
2024-03-19 17:19:48 +07:00 |
|
|
|
c4980c19e7
|
Revert "docxf and oform since v7.0"
This reverts commit beb9885b03.
# Conflicts:
# web/documentserver-example/php/doceditor.php
v99.99.99.3780
v99.99.99.3779
|
2024-03-18 18:24:47 +03:00 |
|
|
|
f1a1ec15ad
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/helpers/users.js
|
2024-03-18 14:38:55 +03:00 |
|
|
|
495ba9814f
|
nodejs: close editor
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/helpers/users.js
v8.1.0.47
v8.1.0.46
|
2024-03-18 14:35:26 +03:00 |
|
|
|
558365325c
|
nodejs: format max length
# Conflicts:
# web/documentserver-example/nodejs/helpers/users.js
|
2024-03-18 14:34:52 +03:00 |
|
|
|
683f1d33c4
|
nodejs: close editor
|
2024-03-18 14:30:25 +03:00 |
|
|
|
e8c98ba12a
|
nodejs: format max length
|
2024-03-18 14:28:30 +03:00 |
|
|
|
e389cf41b8
|
fix(ruby): linter offence
|
2024-03-18 16:27:59 +05:00 |
|
|
|
80291baa40
|
goback: change state for users (408d80fff6)
|
2024-03-18 14:21:12 +03:00 |
|
|
|
b9113f93f6
|
fix: linter offenses
|
2024-03-18 16:03:00 +05:00 |
|
|
|
af778a8636
|
fix(ruby): linter offenses
|
2024-03-18 15:26:22 +05: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 |
|
|
|
b2202111ac
|
fix changelog
|
2024-03-15 16:47:29 +03:00 |
|
|
|
1da215b1eb
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/auto-conversion-error
# Conflicts:
# CHANGELOG.md
|
2024-03-15 16:46:37 +03:00 |
|
|
|
a3016f3f96
|
Merge remote-tracking branch 'remotes/origin/master' into develop
v99.99.99.3776
v99.99.99.3777
v99.99.99.3778
|
2024-03-15 13:18:37 +03:00 |
|
|
|
333981cdad
|
Merge pull request #549 from ONLYOFFICE/release/1.8.0
Release/1.8.0
v8.1.1.6
v8.1.1.3
v1.8.0
v8.1.0.39
v8.1.0.40
v8.1.1.8
v8.1.0.43
v8.1.1.4
|
2024-03-15 13:02:53 +03:00 |
|
|
|
cee60a340a
|
nodejs: code alert 177 (e85cb5137b)
|
2024-03-15 12:55:59 +03:00 |
|
|
|
6c09b3f62a
|
nodejs: wopi formsubmit icon
|
2024-03-15 11:18:45 +03:00 |
|
|
|
4b7ba35f83
|
nodejs: send email and image for protect request
|
2024-03-15 11:06:48 +03:00 |
|
|
|
a952858ab8
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
v99.99.99.3775
|
2024-03-14 15:07:47 +03:00 |
|
|
|
65ff78fba7
|
Merge pull request #548 from ONLYOFFICE/fix/ruby-conversion-progress
fix(ruby): conversion percent type validation. Fix Bug 66869
|
2024-03-14 15:07:11 +03:00 |
|
|
|
717996af87
|
Merge pull request #547 from ONLYOFFICE/fix/ruby-historyobj
fix(ruby): historyobj method. Fix Bug 66862
|
2024-03-14 15:06:45 +03:00 |
|
|
|
66389fe69c
|
fix(ruby): conversion percent type validation. Fix Bug 66869
|
2024-03-14 17:24:02 +07:00 |
|
|
|
a63d8d4284
|
fix(ruby): previous in history data
|
2024-03-14 16:30:22 +07:00 |
|
|
|
ed39928d1f
|
Merge pull request #546 from ONLYOFFICE/fix/ruby-saveas-url-in-docker
fix(ruby): replacing file_url host in saveas. Fix Bug 66874
|
2024-03-14 11:13:50 +03:00 |
|
|
|
5bc7ffde73
|
fix(ruby): historyobj method. Fix Bug 66862
|
2024-03-13 18:27:58 +07:00 |
|
|
|
5258fd0674
|
feat(csharp-mvc): handling auto-conversion error(-9)
|
2024-03-13 15:39:42 +05:00 |
|
|
|
ca274bc465
|
feat(csharp): handling auto-conversion error(-9)
|
2024-03-13 15:39:07 +05:00 |
|
|
|
b1d66e16a5
|
feat(java-spring): handling auto-conversion error(-9)
|
2024-03-13 15:38:24 +05:00 |
|
|
|
359cda0f67
|
feat(java): handling auto-conversion error(-9)
|
2024-03-13 15:37:13 +05:00 |
|
|
|
24a3441b1e
|
feat(ruby): handling auto-conversion error(-9)
|
2024-03-13 15:36:13 +05:00 |
|
|
|
c6eff10be1
|
fix(ruby): replacing file_url host in saveas. Fix Bug 66874
|
2024-03-13 17:36:06 +07:00 |
|
