Commit Graph

21 Commits

Author SHA1 Message Date
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +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
178bf82c28 Settings: fix 2020-08-03 17:06:37 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
ff84afb110 Merge branch 'master' into feature/elastic
# Conflicts:
#	web/ASC.Web.Core/SetupInfo.cs
2020-02-05 11:43:03 +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
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
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
859bda608b Settings: added get cultures method 2019-09-23 16:19:01 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
377287570a Added ASC.Feed, ASC.IPSecurity
Added Resources
2019-06-14 19:14:24 +03:00