Commit Graph

76 Commits

Author SHA1 Message Date
043dd3d180 net6: bugfix encrypt 2021-11-26 13:53:06 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
8409b10705 net6: warning SYSLIB0022 2021-10-01 13:34:47 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
7ad62ded2b Auth: fix confirm 2021-05-13 14:02:33 +03:00
4b756843ca Tfa: validate confirm link 2021-04-16 21:54:53 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
SuhorukovAnton
f4c0515340 fix-messages: IDE0022 2020-10-10 13:01:09 +03:00
49a7e215d2 added editorconfig 2020-10-09 18:52:17 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
08590b6b58 Fix confirm 2020-10-07 13:45:53 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SuhorukovAnton
31cc18f568 fix-messages: IDE1006 2020-09-29 15:27:28 +03:00
89df700fb1 Files: fix 2020-09-25 13:47:21 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +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
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
dd28738907 Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
e9b6976187 Renamed all "*factory" classes to "*Extension" 2019-11-11 14:50:46 +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
0be2995e83 DI: filters and handlers 2019-11-01 12:37:02 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +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
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
09881619b8 DI: DbManager 2019-10-18 16:29:24 +03:00
219036d4a4 DI: HttpContext 2019-10-18 11:48:27 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
Daniil Senkiv
2ed3ee4905 Web.Client/Core: added method of deleting self profile 2019-10-04 07:58:38 +03:00
0e3ad46012 Auth: fix 2019-09-27 19:16:11 +03:00
55138419b4 Confirm: fix auth 2019-09-27 18:53:40 +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