|
1c4d1efa83
|
fix
|
2021-09-28 20:30:02 +03:00 |
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
163e73ef4a
|
Personal: optimization
|
2021-08-12 14:00:05 +03:00 |
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
2be10b8bd9
|
Settings: added personal settings
|
2021-06-02 19:13:47 +03:00 |
|
|
e43445cb2d
|
Config: Enabled personal mode in appsettings.json
|
2021-06-02 16:17:23 +03:00 |
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
06928a7896
|
People: fixed group cache
|
2021-05-18 18:50:48 +03:00 |
|
Vashchuk Nikita
|
94047ab0a1
|
Fix Calendar
|
2021-05-17 21:35:23 +03:00 |
|
|
a5c6ba5dcc
|
Common, db: moved from 08a01422
|
2021-05-17 14:35:00 +03:00 |
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
|
3b2bebddf2
|
TenantManager: fix currentTenant
|
2020-11-09 14:51:21 +03:00 |
|
|
43beaf6f6b
|
Refactoring: scope
|
2020-10-29 17:30:08 +03:00 |
|
|
3256a3dbc7
|
DI: fix
|
2020-10-28 23:02:03 +03:00 |
|
|
51f1f92307
|
Scope: refactoring.
|
2020-10-28 15:26:27 +03:00 |
|
|
f56f231c91
|
Refactoring: scope
|
2020-10-19 22:04:07 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
SuhorukovAnton
|
9b6ccc19f0
|
fix-messages: IDE0074
|
2020-09-29 14:51:34 +03:00 |
|
SuhorukovAnton
|
d866eccade
|
fix-messages: IDE0044
|
2020-09-28 18:42:03 +03:00 |
|
|
0000129b3b
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
|
2020-09-20 20:17:12 +03:00 |
|
|
dd80e300d0
|
Common, Core.Common moved from release/11 4414f77b
|
2020-09-15 16:11:05 +03:00 |
|
SuhorukovAnton
|
89daf213c5
|
encryption: fix
|
2020-09-08 15:07:59 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
78593b8c1f
|
UserManager: fix
|
2020-06-17 12:53:12 +03:00 |
|
|
dedd754875
|
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
|
2020-06-16 17:44:56 +03:00 |
|
|
09e7a81e9b
|
UserManager: fix
|
2020-06-15 18:39:52 +03:00 |
|
|
344916b395
|
TenantManager: fix
|
2020-06-09 10:54:05 +03:00 |
|
|
87af491e89
|
Feed: FilesModule
|
2020-06-04 13:54:13 +03:00 |
|
|
4544469dca
|
TenantManager: add TenantHolder
|
2020-06-01 13:55:26 +03:00 |
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +03:00 |
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
adab38548a
|
Files: Index Service
|
2020-04-28 18:11:10 +03:00 |
|
|
c780a881df
|
Files: fixed removing file method
|
2020-03-04 10:42:43 +03:00 |
|
|
46ae46dcd1
|
Files: fixed start services
|
2020-02-27 11:44:55 +03:00 |
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
a90b1fb424
|
People: added GetExpression
|
2020-02-25 11:02:13 +03:00 |
|