Commit Graph

203 Commits

Author SHA1 Message Date
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
a1e1cd17be FileHandler: fix 2020-04-15 13:46:24 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +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
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
965e8df12b Core: Resources 2020-02-11 18:41:40 +03:00
26b6ef0e2c Files: DI 2020-02-10 16:06:03 +03:00
67049195f8 Files: DI, EF 2020-02-05 18:37:31 +03:00
508efb1fca Files: EF, DI 2020-02-05 16:33:09 +03:00
ff84afb110 Merge branch 'master' into feature/elastic
# Conflicts:
#	web/ASC.Web.Core/SetupInfo.cs
2020-02-05 11:43:03 +03:00
767448acb9 Files: EF, DI 2020-02-04 11:41:04 +03:00
b4b8b339ef Web.Core: CommonLinkUtility: fixed profile links 2020-02-04 10:02:14 +03:00
671b043b7e Files: GoogleDriveApp 2020-02-03 16:31:42 +03:00
51d8b9758c Files: BoxApp 2020-02-03 13:41:24 +03:00
33e3254695 moved from hotfix/10.5.2 2020-01-31 11:25:55 +03:00
48409f8f82 Files: folderDao 2020-01-29 15:42:17 +03:00
08d51bb1ed Files: FileDao 2020-01-28 17:59:59 +03:00
b4ff0c09a7 moved from hotfix/10.5.2 2020-01-23 14:04:42 +03:00
a93d7adda6 moved from hotfix/10.5.2 2020-01-23 11:52:07 +03:00
f5b3f2838b moved from hotfix/10.5.2 2020-01-22 16:59:49 +03:00
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
dd28738907 Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
04d8bf05eb EF: MultiRegionalDbManager 2019-12-16 17:55:59 +03:00
08c98691d5 EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
db5f113480 EF: Mail 2019-12-13 14:37:58 +03:00
7ebca49738 EF: MobileAppInstall 2019-12-12 18:24:47 +03:00
2758fb1dfb Merge branch 'master' into feature/ef 2019-12-12 17:53:54 +03:00
a47196dc05 EF: Voip 2019-12-11 17:30:28 +03:00
6cd6eedde0 EF: notify 2019-12-11 12:47:55 +03:00
a623670582 EF: notify 2019-12-10 16:42:29 +03:00
647333b3c2 EF: feed 2019-12-10 12:05:28 +03:00