|
|
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 |
|
|
|
a070b6e82b
|
nodejs: rename back (eda1876f59)
|
2024-04-03 14:27:57 +03:00 |
|
|
|
43d260cd7a
|
Merge pull request #534 from ONLYOFFICE/feature/nodejs-forced-conversion
Feature/nodejs forced conversion
|
2024-04-03 14:05:24 +03:00 |
|
|
|
14bb9fc8a4
|
Merge pull request #556 from ONLYOFFICE/fix/wopi-mobile-default-action
fix(nodejs): mobileEdit default action for mobile wopi page. Fix Bug 65920
|
2024-04-03 13:07:02 +03:00 |
|
|
|
57ca15153f
|
Merge pull request #551 from ONLYOFFICE/feature/fetching-formats
Feature/fetching formats
|
2024-04-03 12:31:53 +03:00 |
|
|
|
bbde4dc87b
|
Merge pull request #525 from ONLYOFFICE/nodejs-update-dependencies
build(nodejs): updated dependencies
|
2024-04-03 12:19:33 +03:00 |
|
|
|
5b46195f72
|
fix(nodejs): mobileEdit default action for mobile wopi page. Fix Bug 65920
|
2024-04-02 12:55:33 +07:00 |
|
|
|
81c94c9fbd
|
refactor(nodejs): load formats script and remove redundant variables
|
2024-04-01 12:24:14 +05:00 |
|
|
|
cc3c640868
|
refactor: merge format and format-manager files into formats file
|
2024-04-01 12:21:18 +05: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 |
|
|
|
20e6664a6b
|
nodejs: absolute url in request to discovery (1e72167e7d)
Revert "nodejs: absolute host is not needed with urllib" (2460f2c7ac)
|
2024-03-28 13:35:50 +03:00 |
|
|
|
61af52a534
|
nodejs: fix favicon on wopi action
|
2024-03-28 10:53:12 +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 |
|
|
|
53c3e97b5c
|
fix(nodejs): linter offence
|
2024-03-25 14:25:03 +05:00 |
|
|
|
eda1876f59
|
refactor(nodejs): rename convext variable and remove redundant internalext variable
|
2024-03-25 14:18:55 +05:00 |
|
|
|
64eab6c4a2
|
refactor(nodejs): add flag for keeping original file and replace conditional expression with it
|
2024-03-25 14:09:36 +05:00 |
|
|
|
909f638a92
|
Merge pull request #552 from ONLYOFFICE/fix/nodejs-wopi-putfile
fix(nodejs): handle document creation in putFile. Fix Bug 66817
|
2024-03-22 10:02:57 +03:00 |
|
|
|
6d28e3f8d8
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
|
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 |
|
|
|
ad39fb7c19
|
nodejs: wopi formsubmit icon
# Conflicts:
# CHANGELOG.md
|
2024-03-20 12:51:24 +03:00 |
|
|
|
0d302ee8f6
|
nodejs: error message when error:1
|
2024-03-19 18:06:43 +03:00 |
|
|
|
fadae60e89
|
fix: linter offenses
|
2024-03-19 13:43:17 +05:00 |
|
|
|
426b15b8f1
|
Merge remote-tracking branch 'origin/develop' into feature/fetching-formats
|
2024-03-19 13:01:48 +05:00 |
|
|
|
601146c847
|
refactor(nodejs): change formats retrieval method on frontend
|
2024-03-19 12:59:54 +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 |
|
|
|
495ba9814f
|
nodejs: close editor
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/helpers/users.js
|
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 |
|
|
|
80291baa40
|
goback: change state for users (408d80fff6)
|
2024-03-18 14:21:12 +03:00 |
|
|
|
456789191d
|
build(nodejs): returned some dependencies versions with breaking changes
|
2024-03-15 17:33:00 +07: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 |
|
|
|
1699dc22b5
|
nodejs: fix rename var (9048082cb7)
|
2024-03-09 16:54:56 +03:00 |
|
|
|
fd21292dbd
|
refactor(nodejs): change parameter name and remove redundant checking
|
2024-03-07 16:24:51 +05:00 |
|
|
|
672aae3791
|
refactor(nodejs): rename variables, ids, and classes regarding forced conversion
|
2024-03-01 16:29:04 +05:00 |
|
|
|
999e147539
|
fix(nodejs): disable file type buttons after selection
|
2024-03-01 15:25:14 +05:00 |
|
|
|
690ab5471b
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-28 17:40:09 +03:00 |
|
|
|
f9fa10e70a
|
nodejs: fix when siteUrl is '/' (Fix Bug 66578)
|
2024-02-28 17:39:48 +03:00 |
|
|
|
2460f2c7ac
|
nodejs: absolute host is not needed with urllib (1e72167e7d)
|
2024-02-28 17:22:31 +03:00 |
|
|
|
e3342a030c
|
nodejs: fix mobile size (Fix Bug 34620)
|
2024-02-28 14:40:21 +03:00 |
|
|
|
19a38df423
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
# web/documentserver-example/nodejs/app.js
|
2024-02-26 12:39:33 +03:00 |
|
|
|
dcf2fb43e0
|
build(nodejs): updated dependencies (found 0 vulnerabilities)
|
2024-02-22 15:47:38 +07:00 |
|
|
|
c91d765296
|
fix(nodejs): editor fileExt validation. fix bug 66576
|
2024-02-22 14:49:46 +07:00 |
|
|
|
fa5fb2f182
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-19 13:56:26 +03:00 |
|
