Commit Graph

36 Commits

Author SHA1 Message Date
SuhorukovAnton
370400e4c0 fix_API_return: first version 2020-10-09 13:05:48 +03:00
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
1871959768 fix 2020-06-25 15:17:22 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
f017d9cc23 fix from review 2020-02-03 13:48:06 +03:00
4ea450720b moved from hotfix/10.5.2 2020-01-22 10:53:16 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
a35a457f6e DI: refactoring. Web.Api 2019-10-31 16:54:43 +03:00
0bbc383266 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
c8573b8301 Confirm: fixed invite link 2019-09-27 15:28:51 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
2034777701 added check permission for GeInviteLink 2019-09-26 11:36:49 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
c7282888d0 Added PortalController 2019-09-03 18:13:25 +03:00