Commit Graph

224 Commits

Author SHA1 Message Date
820117cb04 Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +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