|
|
91c03420e1
|
CoreCommon: EnableMailServer field in TenantQuota is not used
|
2022-08-12 15:57:29 +03:00 |
|
|
|
055ad130b4
|
CoreCommon: CountRoom as a new field in TenantQuota
|
2022-08-12 15:57:29 +03:00 |
|
|
|
891f9bf0f1
|
CoreCommon: ActiveUsers as feature value
|
2022-08-12 15:57:29 +03:00 |
|
|
|
74460213a8
|
CoreCommon: MaxTotalSize as feature value
|
2022-08-12 15:57:28 +03:00 |
|
|
|
56ad5e6d5a
|
CoreCommon: default data for quota (a861268e4f)
|
2022-08-12 15:57:28 +03:00 |
|
|
|
4218e45601
|
CoreCommon: rename AvangateId field to ProductId
|
2022-08-12 15:57:28 +03:00 |
|
|
|
40e58d73b2
|
CoreCommon: removed autorenewal field
|
2022-08-12 15:57:27 +03:00 |
|
|
|
23b059c0cc
|
fix
|
2022-08-11 22:35:53 +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 |
|
|
|
48d8e16d49
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-10 15:33:13 +03:00 |
|
|
|
97aee7f8c2
|
SSO: fix login
|
2022-08-10 15:33:02 +03:00 |
|
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +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 |
|
|
|
6db28a8a86
|
warm up service: added logs
|
2022-08-09 12:51:32 +03:00 |
|
|
|
5f69b6bc0c
|
warm up services
|
2022-08-09 10:28:44 +03:00 |
|
|
|
f496771391
|
warm up services
|
2022-08-09 09:49:05 +03:00 |
|
|
|
562eb6144d
|
SSO: fix login
|
2022-08-09 01:26:27 +03:00 |
|
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
|
9ce72036ec
|
fix
|
2022-08-08 18:32:46 +03:00 |
|
|
|
d26eee0424
|
Async: fix webhook
|
2022-08-05 18:47:33 +03:00 |
|
|
|
59160afcdc
|
SSO: fix template path
|
2022-08-05 17:29:17 +03:00 |
|
|
|
92fa19ec82
|
Webhook: fix iasyncenumerable
|
2022-08-04 18:59:21 +03:00 |
|
|
|
26b79aa67b
|
Added install-state.gz to .gitignore
|
2022-08-03 17:22:10 +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 |
|
|
|
07e8e49579
|
Web: Fix Frontend.Translations.Tests run
|
2022-08-01 15:55:39 +03:00 |
|
|
|
58d3407729
|
fix
|
2022-08-01 13:58:14 +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 |
|
|
|
9df9195cff
|
suppress warning
|
2022-08-01 13:41:33 +03:00 |
|
|
|
ef48119187
|
Update .yarn/install-state.gz
|
2022-07-29 22:38:54 +03:00 |
|
|
|
1ae3cce198
|
ASC.WebDav: Upgrade yarn to v3.2.2
|
2022-07-29 22:28:13 +03:00 |
|
|
|
5237c5ae98
|
ASC.UrlShortener: Upgrade yarn to v3.2.2
|
2022-07-29 22:26:54 +03:00 |
|
|
|
50ed43af17
|
ASC.SsoAuth: Upgrade yarn to v3.2.2
|
2022-07-29 22:25:53 +03:00 |
|
|
|
b2454b35ce
|
ASC.Socket.IO: Upgrade yarn to v3.2.2
|
2022-07-29 22:24:09 +03:00 |
|
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
|
615448319a
|
fix mapper
|
2022-07-29 18:39:57 +03:00 |
|
|
|
9d69882cf3
|
removed BaseDbContext
|
2022-07-29 15:53:29 +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 |
|
|
|
997e20898a
|
EF: added support of dbcotextpool
|
2022-07-27 20:12:08 +03:00 |
|
|
|
33769036d5
|
fix
|
2022-07-26 14:53:36 +03:00 |
|
|
|
3d22992b7d
|
Migrations: rename
|
2022-07-26 14:52:53 +03:00 |
|
|
|
824232c01a
|
fix
|
2022-07-25 19:31:37 +03:00 |
|
|
|
17a15852a8
|
fix
|
2022-07-25 17:36:52 +03:00 |
|
