Commit Graph

54 Commits

Author SHA1 Message Date
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
8a3db93d0d Backup: moved from 08a01422 2021-05-17 21:27:39 +03:00
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
Artem Tarasov
1a8aacebdc Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Resource.Manager/Startup.cs
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
b4b8b339ef Web.Core: CommonLinkUtility: fixed profile links 2020-02-04 10:02:14 +03:00
f5b3f2838b moved from hotfix/10.5.2 2020-01-22 16:59:49 +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
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
c54f575c26 DI: StudioNotifyService 2019-11-01 11:49:08 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +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
Daniil Senkiv
c0dc7125ea Web.Core: CommonLinkUtility: fixed generating confirm link 2019-09-27 11:58:10 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
Daniil Senkiv
95a369a091 Web.Core: revert d511e14e8e 2019-09-26 14:59:18 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
df9b6efa92 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/GroupController.cs
2019-09-20 14:27:03 +03:00
Daniil Senkiv
d511e14e8e Web.Core: CommonLinkUtility: fixed generating link for creating user through invitation link 2019-09-20 10:58:07 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
7cd8e53d2c Merge branch 'master' into refactoring/di 2019-09-10 16:15:15 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
Daniil Senkiv
8629a15679 Web.Core: CommonLinkUtility: fixed 2019-09-09 15:07:15 +03:00
c7282888d0 Added PortalController 2019-09-03 18:13:25 +03:00
238e103440 Optimization 2019-09-03 15:23:58 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
8c8b844a70 Added ASC.Notify.Textile 2019-08-19 16:51:36 +03:00
0bd089938e IDE0059 2019-08-16 12:08:46 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00