Commit Graph

906 Commits

Author SHA1 Message Date
c86c6bf17e Merge branch 'develop' into feature/user-image 2023-11-07 11:25:40 +07:00
1d747b834d Merge branch 'feature/user-image' of https://github.com/ONLYOFFICE/document-server-integration into feature/user-image 2023-11-01 10:25:20 +07:00
1620e8277d Merge remote-tracking branch 'remotes/origin/develop' into feature/referenceData-open
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/python/src/views/actions.py
2023-10-31 14:25:00 +03:00
1ab93ccb28 nodejs: fix searching server address (969a8c6cfe) 2023-10-27 11:44:46 +03:00
36463aae8c nodejs: return external link in reference request 2023-10-27 11:28:00 +03:00
4bce33e3c2 nodejs: set required users only 2023-10-26 16:27:35 +03:00
e913cb3d27 nodejs: setUsers info 2023-10-26 16:27:26 +03:00
2f87f3b7c9 nodejs: set current avatar 2023-10-26 16:26:59 +03:00
8696f26555 nodejs: fix directUrl property (815b5fb) 2023-10-26 15:33:03 +03:00
b5251b0e92 nodejs: fix mobile size for chrome on iOS (f096fd4d93) 2023-10-24 10:16:16 +03:00
f096fd4d93 nodejs: fix mobile size for chrome on iOS (Fix Bug 59054) 2023-10-23 18:02:51 +03:00
d3a08acec3 Revert "Fix Bug 34620 - resize on mobile"
This reverts commit a9d261a0ad.

# Conflicts:
#	web/documentserver-example/nodejs/views/editor.ejs
2023-10-23 16:35:34 +03:00
fa50ffbc28 nodejs: date format fix (Fix Bug 64155)
# Conflicts:
#	web/documentserver-example/nodejs/helpers/docManager.js
2023-10-23 13:19:29 +03:00
f3fe76387b Merge remote-tracking branch 'remotes/origin/develop' into feature/upload-name 2023-10-23 12:56:09 +03:00
cf64a80daa nodejs: set required users only 2023-10-20 14:53:17 +03:00
d29805a5ed nodejs: setUsers info 2023-10-20 14:53:11 +03:00
2a75ea80b8 nodejs: set current avatar 2023-10-20 14:37:04 +03:00
964aedf57b nodejs: fix lint (b01553af60) 2023-10-20 14:33:45 +03:00
38988ab5fd node: lint fix 2023-10-20 18:33:36 +07:00
1b1f276354 Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name 2023-10-20 18:27:27 +07:00
3e9a98f0d8 max name length =50 and this value in constant var 2023-10-20 18:22:38 +07:00
05b1b98204 nodejs: email is not required for protection 2023-10-20 13:35:24 +03:00
b01553af60 nodejs: move comment (715ab7d690) 2023-10-20 12:54:39 +03:00
49d220d673 Merge remote-tracking branch 'remotes/origin/develop' into feature/upload-name
# Conflicts:
#	CHANGELOG.md
2023-10-20 12:11:45 +03:00
73acfe8721 Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop
# Conflicts:
#	CHANGELOG.md
2023-10-19 12:52:24 +03:00
0a8df9cb5d 1.7.0 2023-10-19 12:40:03 +03:00
31635a2e68 Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop 2023-10-12 13:51:38 +03:00
c6a2007c6a nodejs: userId in history fixed 2023-10-12 13:21:58 +03:00
80028ead64 Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name 2023-10-12 14:40:00 +07:00
f57b430744 lint fix 2023-10-12 14:38:40 +07:00
d36c70b6f5 Merge branch 'develop' into feature/select-word 2023-10-11 13:49:39 +07:00
78cc152c93 Merge branch 'develop' into feature/select-word 2023-10-11 13:42:34 +07:00
583e162520 Merge branch 'develop' into feature/upload-name 2023-10-11 11:24:24 +07:00
a6c805791e end of name fix 2023-10-11 10:49:37 +07:00
53e780579b nodejs: trimming long name of uploading file 2023-10-10 11:46:53 +07:00
d790c2954f Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop 2023-10-09 13:37:45 +03:00
847e4ce6d9 nodejs: fix datetime format in history (56e46466b2) (Fix Bug 64155) 2023-10-09 13:30:49 +03:00
2bf4187fd4 Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop 2023-09-29 14:20:53 +03:00
152083ed4e nodejs: update icons 2023-09-29 14:20:34 +03:00
2c52f96cac nodejs: onRequestSelectDocument event fix 2023-09-28 13:11:29 +07:00
7eddfa4703 Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop 2023-09-25 12:48:01 +03:00
ce0bbca5b2 nodejs: update fast-xml-parser 2023-09-25 12:46:58 +03:00
e6831fa52f nodejs: XMLParser usage fixed 2023-09-22 11:31:29 +03:00
ffa686e0a2 update fast-xml-parser package version to 4.3.0 2023-09-22 11:09:45 +03:00
730cc09520 build(deps): bump fast-xml-parser in /web/documentserver-example/nodejs
Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 3.19.0 to 4.2.4.
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/commits)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-22 09:32:30 +03:00
01e9dcf1a8 fixed the sample archive names 2023-09-20 17:58:00 +03:00
ef53346f16 nodejs: fix lint (6315ccbf45) 2023-09-11 22:34:11 +03:00
33600df8a9 added paths to the config files 2023-09-11 18:57:19 +03:00
969a8c6cfe nodejs: link in referenceData 2023-09-07 11:05:57 +03:00
4fa9d4c9fd nodejs: remove /files route (8bcc15e320) 2023-09-02 11:18:34 +03:00