|
d4eefc6145
|
Files: fixed optional params
|
2022-08-19 15:47:11 +03:00 |
|
|
8b6821d410
|
Files: fixed .format folders methods
|
2022-08-19 14:57:51 +03:00 |
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +03:00 |
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
5b613b8078
|
Files: async fix
|
2022-08-11 22:25:29 +03:00 |
|
|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
|
44bd9f1d6d
|
Files: fix
|
2022-08-11 16:55:35 +03:00 |
|
|
2936cb4ca2
|
Files: fix
|
2022-08-11 16:44:08 +03:00 |
|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +03:00 |
|
|
0ad8be0d1a
|
Files: fix
|
2022-08-11 14:30:01 +03:00 |
|
|
c0bf10af9e
|
Files: fix
|
2022-08-10 22:27:44 +03:00 |
|
|
a63ee39d36
|
Files: removed unused method
|
2022-08-10 21:23:46 +03:00 |
|
|
69e5665763
|
Files: async fix
|
2022-08-10 19:45:59 +03:00 |
|
|
39c7a8ac2c
|
Files: fix
|
2022-08-09 23:23:36 +03:00 |
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
05d5421ebc
|
fix
|
2022-08-09 17:11:40 +03:00 |
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
d679a3d9a7
|
Files: async fix
|
2022-08-09 16:09:14 +03:00 |
|
|
a73b9cf2e4
|
Files: async fix
|
2022-08-08 23:03:58 +03:00 |
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
9149d08937
|
Files: async
|
2022-08-04 13:47:18 +03:00 |
|
|
ce1917c77f
|
Async: refactoring
|
2022-08-03 17:29:20 +03:00 |
|
|
7b40920552
|
Chinese (Traditional, Taiwan) empty file templates
|
2022-08-02 17:41:42 +03:00 |
|
|
3d531e653d
|
Files: update docstore submodule (b8a2cf5292 )
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-08-02 17:41:04 +03:00 |
|
|
bb80d28945
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
|
2022-08-02 17:03:50 +03:00 |
|
|
9d3bc076b9
|
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
|
2022-08-02 11:59:47 +03:00 |
|
|
a4ea50c760
|
split AuditReportCreator
|
2022-08-01 17:23:50 +03:00 |
|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
3c3234b6c2
|
Merge branch 'develop' into feature/fix-api
|
2022-08-01 13:51:05 +03:00 |
|
|
4559942c30
|
fix confrim links
|
2022-08-01 13:50:31 +03:00 |
|
|
d406e8deb5
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 13:14:47 +03:00 |
|
|
b03f8bc1dc
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 11:49:11 +03:00 |
|
|
af8ebef56e
|
Web: Removed ASC.Projects/Client
|
2022-07-31 13:16:31 +03:00 |
|
|
2c5da93540
|
Web: Removed ASC.Mail/Client
|
2022-07-31 13:15:59 +03:00 |
|
|
30031a8b52
|
Web: Removed ASC.CRM/Client
|
2022-07-31 13:15:29 +03:00 |
|
|
0a3ddbdb10
|
Web: Removed ASC.Calendar/Client
|
2022-07-31 13:14:59 +03:00 |
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
0c1ff6ffd7
|
union tests GetLink and ShareRoomByLink
|
2022-07-27 18:22:51 +03:00 |
|
|
12e167ca84
|
Files: fix archive folder for WebDav
|
2022-07-27 17:34:10 +03:00 |
|
Artem Tarasov
|
2988838060
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-26 12:32:41 +03:00 |
|
Artem Tarasov
|
294cdf4881
|
Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr)
|
2022-07-26 11:19:01 +03:00 |
|
Artem Tarasov
|
9dcff71504
|
Web: Doceditor/Client: fixed share settings request (ssr)
|
2022-07-25 14:52:18 +03:00 |
|
|
8ba9be1208
|
deleted commonfilesdbcontext
|
2022-07-25 14:14:03 +03:00 |
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|