|
|
01b515cf84
|
Files: Refactoring of GetSocketRoom
|
2022-01-28 17:47:24 +03:00 |
|
|
|
36b4b64f3a
|
Web: Socket: Added new methods CreateFolder, DeleteFolder
|
2022-01-27 11:42:57 +03:00 |
|
|
|
403704c9c1
|
Web: Files: Socket: Added new data parameter for "s:modify-folder"
|
2022-01-25 12:03:15 +03:00 |
|
|
|
eb75b0b32a
|
Web: Files: Added opportunity to react on modify-folder with socket
|
2022-01-24 20:43:24 +03:00 |
|
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
|
|
5fcf5cc1cc
|
Files: copyas method now has "Password" param
|
2022-01-11 18:27:06 +03:00 |
|
|
|
6cbd02b71c
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# products/ASC.Files/Server/DocStore
# yarn.lock
|
2022-01-10 11:06:32 +03:00 |
|
|
|
5c97e7ed63
|
Web: Socket.IO: Changed logger settings
|
2021-12-30 15:55:00 +03:00 |
|
|
|
3c23f4d892
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-12-30 14:34:49 +03:00 |
|
|
|
98f12cc15f
|
DocStore: resolve conflict (febf172875)
|
2021-12-28 18:20:59 +03:00 |
|
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
|
00ab71280c
|
Merge branch 'release/v1.1.0' into feature/editor-history
|
2021-12-10 09:36:12 +03:00 |
|
|
|
4a2342f39b
|
Files: added new checkconversion method's param
|
2021-12-08 20:17:50 +03:00 |
|
|
|
1b289515be
|
Files: rename master form to form template
|
2021-12-08 17:00:04 +03:00 |
|
|
|
36fa4131cc
|
fix Bug 53137: save lastModified when uploading file
|
2021-12-08 15:36:24 +03:00 |
|
|
|
feb48c01a0
|
Files: moved from feature/editor-version-history
|
2021-12-08 15:25:39 +03:00 |
|
|
|
bff93c7141
|
moved from fc682b37
|
2021-12-03 18:28:20 +03:00 |
|
|
|
b1417e68ea
|
Files: fixed creating file from template in thirdparty
|
2021-12-03 17:38:13 +03:00 |
|
|
|
88c1f3271d
|
Files: fix copyAs
|
2021-11-29 17:52:50 +03:00 |
|
|
|
85316c9d63
|
Moved from 45122194
|
2021-11-29 14:11:03 +03:00 |
|
|
|
49897b0617
|
update docxf and oform with embedded mime type
|
2021-11-25 11:07:32 +03:00 |
|
|
|
11d527ba03
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:40:24 +03:00 |
|
|
|
cc4d835335
|
Updated forms
|
2021-11-17 16:43:29 +03:00 |
|
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
|
|
4f0edbe593
|
fix Bug 52983
|
2021-10-12 10:24:51 +03:00 |
|
|
|
c0deac1eb6
|
Files: startedit. fix empty body
|
2021-10-06 22:43:28 +03:00 |
|
|
|
cfb8174772
|
fix Bug 52655
|
2021-10-06 15:32:03 +03:00 |
|
|
|
1513a42a6a
|
fix Bug 52655
|
2021-10-05 18:20:29 +03:00 |
|
|
|
e727138aae
|
fix Bug 52926
|
2021-10-04 20:37:28 +03:00 |
|
|
|
dd7a504e06
|
Files: refactoring
|
2021-10-01 14:01:44 +03:00 |
|
|
|
24224a7437
|
Files: fix rename folders. fix favorites
|
2021-09-30 21:26:01 +03:00 |
|
|
|
bc48760294
|
Merge branch 'release/1.0.0' into develop
|
2021-09-30 19:36:18 +03:00 |
|
Sergey Kirichenko
|
dbc174e955
|
Add support to deb package (#266)
|
2021-09-30 15:05:43 +03:00 |
|
|
|
2e80f8c30a
|
fix Bug 52679
|
2021-09-30 12:21:48 +03:00 |
|
|
|
9d76069ec8
|
fix Bug 52666
|
2021-09-30 09:52:46 +03:00 |
|
|
|
19bf04e461
|
fix Bug 52768
|
2021-09-29 19:08:30 +03:00 |
|
|
|
82e25852ad
|
Files: fix get file info
|
2021-09-29 13:17:32 +03:00 |
|
|
|
1f9116d322
|
Files: fix thirdparty
|
2021-09-28 18:12:06 +03:00 |
|
|
|
39a1d433da
|
Files: MoveOrCopyBatchCheckFromBody is now GET
|
2021-09-28 11:57:03 +03:00 |
|
|
|
acded72c12
|
Files: fix upload files
|
2021-09-27 22:28:49 +03:00 |
|
|
|
bab3425bd1
|
Files: fix string ids
|
2021-09-24 21:40:29 +03:00 |
|
|
|
ac58470a1b
|
fix Bug 52594
|
2021-09-16 14:49:44 +03:00 |
|
|
|
a748b35f67
|
fix bug 51819.
Files: open edit. added view param
|
2021-09-15 13:26:56 +03:00 |
|
|
|
abaf381a09
|
Files: increase limits
|
2021-08-31 17:03:51 +03:00 |
|
|
|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
|
d19c16565d
|
Files: presigned url
|
2021-08-11 18:04:23 +03:00 |
|
|
|
e66f1f31bf
|
Files: added sync convert
|
2021-08-11 17:32:40 +03:00 |
|
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
d8612e2e01
|
Hide Privacy Rooms on personal
|
2021-07-09 18:41:07 +03:00 |
|
