b27e973ec0
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
...
Feature/support hosting as service
2021-04-28 15:33:53 +03:00
8bb173fa92
Thirdparty: fix providers
2021-04-26 21:42:39 +03:00
d97928fd37
Merge branch 'develop' into feature/support-hosting-as-service
2021-04-26 19:52:32 +03:00
6d2f417c5c
Method GetAuthProviders moved to PeopleController
2021-04-25 11:46:44 +03:00
2d8b085d02
add support WindowsService/systemd for IHostBuilder
...
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
Alexey Kostenko
c45cfe87a1
Merge branch 'feature/oauth2.0' of github.com:ONLYOFFICE/AppServer into feature/oauth2.0
2021-04-19 09:50:05 +03:00
Alexey Kostenko
03ec607cbf
Merge branch 'develop' into feature/oauth2.0
2021-04-19 08:25:42 +03:00
2a6a556a38
Merge pull request #226 from ONLYOFFICE/feature/dotnet-core-debugging-with-WSL-2
...
Feature/dotnet core debugging with wsl 2
2021-04-17 11:36:14 +03:00
4917131ccc
People: fixed signup
2021-04-16 21:50:50 +03:00
5f2998af87
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
2021-04-16 19:33:26 +03:00
995579ac8b
People: change number method
2021-04-16 18:32:31 +03:00
Alexey Kostenko
82e66bf861
Server: People: Fixed signup API
2021-04-16 16:33:17 +03:00
3aae413e12
replace Path.Combine to CrossPlatform.PathCombine
2021-04-16 16:26:26 +03:00
741c3a17ab
People: Added thirdparty/signup method
2021-04-15 14:34:22 +03:00
18b4fba15a
Merge branch 'develop' into feature/dotnet5
2021-03-31 20:38:05 +03:00
13f097e039
People: fix Activation
2021-03-26 15:59:56 +03:00
18a2c0a53d
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
f8c2f20fe8
Merge branch 'develop' into feature/workspaces
2021-03-23 14:21:30 +03:00
a94a87855a
People: fix ChangeUserPassword
2021-03-23 14:18:44 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
59ffbeaf1e
People: added method to get groups with members
2021-02-03 13:48:52 +03:00
f0e227731f
Fixed loading products, lazy loading webitemmanager
2021-01-26 12:29:50 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
f8be896241
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
Diana
e20b87447e
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-24 03:18:47 +03:00
57ba1d7cc5
People: model. Added FromInviteLink
2020-12-22 17:19:58 +03:00
64f8aadd56
People: fix activation email
2020-12-22 15:54:34 +03:00
Diana
fada5e278b
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
2020-12-17 13:20:52 +03:00
c48b5783f1
People: search ignore case
2020-12-07 19:56:59 +03:00
1675896294
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
40546da35d
fix create file
2020-11-26 20:30:57 +03:00
4a1023808c
People: filter groups
2020-11-24 16:13:49 +03:00
6cb92946be
fix uploadmemberphoto
2020-11-17 18:01:34 +03:00
eb6b54482e
fix warnings
2020-11-17 13:47:17 +03:00
75fce656f0
Merge branch 'develop' into feature/dotnet5
2020-11-17 11:31:14 +03:00
a66f99f574
net5.0
2020-11-15 18:55:57 +03:00
68483bc979
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
SuhorukovAnton
9039c810c5
x-www-form-urlencoded: fix
2020-11-11 18:36:58 +03:00
SuhorukovAnton
44e565ca37
x-www-form-urlencoded: add models
2020-11-10 13:41:32 +03:00
SuhorukovAnton
89c6e5548c
x-www-form-urlencoded: fix
2020-11-06 13:39:25 +03:00
SuhorukovAnton
7b8efca8b3
x-www-form-urlencoded: fix
2020-11-06 12:46:57 +03:00
SuhorukovAnton
855c5bc92b
x-www-form-urlencoded: first version
2020-11-06 12:03:49 +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
7e828b5643
Autofac: fix
2020-11-02 19:27:08 +03:00
265feee81e
Refactoring: scope
2020-10-29 12:31:55 +03:00
049e8f63e9
Refactoring: scope.
2020-10-29 11:13:51 +03:00
51f1f92307
Scope: refactoring.
2020-10-28 15:26:27 +03:00
e9a9b320e8
Scope: refactoring. Notify, People
2020-10-27 18:34:22 +03:00
830c73a134
Scope: refactoring
2020-10-19 18:53:15 +03:00
181ac04fd8
DI: register fix
2020-10-18 19:34:30 +03:00
9968873305
Merge branch 'master' into feature/fix_API_return
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
c622be89a3
revert discard
2020-10-12 22:39:23 +03:00
43b9c33979
fix formating
2020-10-12 19:23:15 +03:00
36034bf97a
fix warnings
2020-10-12 16:52:31 +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
SuhorukovAnton
370400e4c0
fix_API_return: first version
2020-10-09 13:05:48 +03:00
SuhorukovAnton
edbc0f247c
fix-messages: IDE0022
2020-09-30 17:47:42 +03:00
58126fd98d
Auth by passwordHash
2020-09-30 17:16:48 +03:00
SuhorukovAnton
ba1ed22345
fix-messages: IDE0058
2020-09-30 14:50:39 +03:00
90e61ba082
Added DistributedTaskProgress
2020-09-30 13:54:49 +03:00
e4d4db6563
Merge branch 'master' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressBase.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2020-09-29 19:46:40 +03:00
9a092cb8ec
moved from release/11 4414f77b
2020-09-18 17:45:59 +03:00
d883ef441f
Api: moved from release/11 4414f77b
2020-09-17 15:04:28 +03:00
maksim
8282f3f658
fix
2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0
private: firtst version
2020-08-12 12:58:08 +03:00
992ab07b87
Common: Reassign. DistributedTaskQueue
2020-08-07 18:42:58 +03:00
ffc756f32b
Backup: DistributedTaskQueue
2020-08-06 21:07:27 +03:00
562abfcdc9
DI: refactoring
2020-07-17 13:52:28 +03:00
e10ac2ccfa
BaseStartup: refactoring
2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a
general-startup: transform GeneralStartup to BaseStartup
2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f
general-startup: fix
2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2
general-startup: fix
2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba
general-startup: first version
2020-07-03 14:47:27 +03:00
635ff124fb
Json: fixed enum
2020-06-05 14:05:42 +03:00
fed4d206f7
Revert logger
2020-06-04 16:46:58 +03:00
b55cc7c697
Startup: added command line
2020-06-04 16:26:31 +03:00
794486f335
Notify: temp log
2020-06-04 16:04:17 +03:00
e7ecaefa3c
Added JsonStringEnumConverter
2020-05-27 16:19:58 +03:00
ecd66902a0
Merge branch 'master' into feature/system-json
2020-05-18 14:16:03 +03:00
47c79d57f0
Optimization
2020-05-17 16:08:20 +03:00
3a747ef8e4
Merge branch 'master' into feature/system-json
...
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
35e2e20049
Files: added model
2020-02-25 15:21:48 +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
a90b1fb424
People: added GetExpression
2020-02-25 11:02:13 +03:00
9db8b26985
Replaced NewtonsoftJson with System.Text.Json
2020-02-21 16:19:32 +03:00
c5dbf8c859
Removed unused dependencies
2020-02-20 17:57:48 +03:00
7a8baecb2a
Files: ef, di
2020-02-19 11:37:52 +03:00
a5280a1694
Added DIHelper
2020-02-17 11:58:14 +03:00
4bad85defe
moved from hotfix/10.5.2
2020-01-17 16:58:26 +03:00
48e56d462a
Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list
2019-12-27 13:19:35 +03:00
aea429a0ad
Api: people. Fixed saving contacts
2019-12-25 18:16:29 +03:00
a8f8b63414
EF: removed old classes
2019-12-23 17:57:21 +03:00
2782d9f64c
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# common/ASC.VoipService/Dao/VoipDao.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
89efaf9d26
Consumers: added config
2019-12-20 14:17:01 +03:00
2758fb1dfb
Merge branch 'master' into feature/ef
2019-12-12 17:53:54 +03:00
NikolayRechkin
ca5e501e2b
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-09 16:08:48 +03:00
NikolayRechkin
94581bdd39
People: deleted unused code
2019-12-09 15:59:34 +03:00
08db3b32b3
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
c9939b0da1
.net core up to 3.1
2019-12-06 12:12:51 +03:00
a047332f9c
Merge branch 'master' into feature/ef
2019-12-04 13:42:31 +03:00
ea60dbe63f
DI: AccountLinker
2019-12-04 13:39:18 +03:00
3dc8c87a94
EF: DbTenantService
2019-12-03 18:20:21 +03:00
997cfa5fda
EF: Updated Dependencies. Optimized logging and userPhotoManager
2019-11-29 12:22:20 +03:00
538511a4dc
EF: options
2019-11-25 14:49:21 +03:00
3586867429
EF: DbUserService
2019-11-25 12:49:12 +03:00
d05565107c
EF: init commit
2019-11-15 18:04:05 +03:00
fcc4e4605f
Common nlog config
2019-11-15 11:47:56 +03:00
04464d52ad
Add "AddEnvironmentVariables" setting
2019-11-14 12:21:15 +03:00
175c86fb49
People: auth fixed
2019-11-13 18:11:30 +03:00
074b8b7f61
People: optimized get all people method
2019-11-12 15:24:59 +03:00
26c8d56219
DI: refactoring. Added EmployeeWraperHelper
2019-11-11 18:42:07 +03:00
e9b6976187
Renamed all "*factory" classes to "*Extension"
2019-11-11 14:50:46 +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
a35a457f6e
DI: refactoring. Web.Api
2019-10-31 16:54:43 +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
726ca634e4
Revert "removed ConfigurationManager"
...
This reverts commit c03be150f4
2019-10-22 16:48:48 +03:00
78584b78a3
DI: removed LogManager
2019-10-22 14:21:44 +03:00
337238c87c
Removed CommonServiceProvider
2019-10-21 18:05:36 +03:00
53d2aaa4e3
DI: DbManager
2019-10-21 16:50:20 +03:00
e0b5661188
DI: dbManager
2019-10-21 15:52:16 +03:00
e82366a2cd
DI: dbManager
2019-10-21 15:33:02 +03:00
247a3b787f
DI: DbManager
2019-10-18 17:22:40 +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
5ec41ccaff
DI: removed appSettings
2019-10-14 11:23:45 +03:00
7c05ba927b
DI: KafkaCache
2019-10-11 18:03:03 +03:00
2ebe431c98
DI: configuration
2019-10-10 11:52:21 +03:00
74d8709f62
DI: configuration
2019-10-09 19:08:37 +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
d3b208b6a5
Web: People: Implemented opportunity to change culture in Profile
2019-09-29 13:50:18 +03:00
5e2823974e
DI: configuration
2019-09-27 18:12:13 +03:00
387ce4e9ad
DI: configuration
2019-09-27 14:51:09 +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
48b2726d78
Confirm: added uid to activation link
2019-09-27 12:20:10 +03:00
710a3f62fa
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
NikolayRechkin
7bcf2a6bf8
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-25 09:04:30 +03:00
NikolayRechkin
1a98489513
People: changed photo upload function
2019-09-24 17:07:24 +03:00
6d815608a0
ConfirmAuth: PasswordChange
2019-09-24 15:27:13 +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
23c00b458b
Auth: added additional roles
2019-09-23 18:36:22 +03:00
fb933d113a
People: fixed update group method
2019-09-23 15:46:42 +03:00
6de13b9d50
DI: configuration
2019-09-23 15:20:08 +03:00
3e0f946372
DI: PathUtils
2019-09-21 19:39:17 +03:00
1e946b19b6
DI: refactoring
2019-09-20 18:53:27 +03:00
8184492a4f
DI: ConfigurationManager
2019-09-20 18:08:45 +03:00
7bb42748b7
DI TenantManager
2019-09-20 15:20:03 +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
a6c8ad75f0
People: check date
2019-09-20 14:07:57 +03:00
85cfe85252
People: added group model
2019-09-20 13:43:13 +03:00
e13049c21f
DI: CommonLinkUtility
2019-09-19 18:55:44 +03:00
409da28d4b
DI: SubscriptionManager
2019-09-19 16:43:28 +03:00
7ceb117690
DI: CoreConfiguration
2019-09-19 14:34:54 +03:00
a07cbe30f4
DI: CoreSettings
2019-09-18 18:19:30 +03:00
4489d01b82
DI: PaymentManager, AuthorizationManager
2019-09-18 17:18:44 +03:00
6ab71a7b65
DI: tenantManager
2019-09-18 16:33:01 +03:00
bcdbcf5ccc
DI: TenantManager
2019-09-18 11:25:57 +03:00
f34dca4ebb
DI: ApiDateTime
2019-09-17 18:38:06 +03:00
4e2c04c9f7
DI: TenantManager
2019-09-17 15:42:32 +03:00
547e589420
Removed TenantProvider
2019-09-16 17:51:39 +03:00
de16476542
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
81394a6f1e
revert 431fb76773
2019-09-16 12:24:06 +03:00
86c5e64b20
added AuthByClaim
2019-09-16 12:21:10 +03:00
98daea7115
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-09-13 17:47:23 +03:00
bdb5b05748
ASC.People: ProfileAction: sending email change instructions
2019-09-13 17:45:22 +03:00
431fb76773
PeopleController: removed CheckImgFormat
2019-09-13 16:33:01 +03:00
NikolayRechkin
25ae6b8b05
web: People: creating a user avatar
2019-09-13 14:41:15 +03:00
473207f9a4
DI: BaseSettings
2019-09-13 14:18:27 +03:00
deb8231f26
revert f85711b736
2019-09-12 14:34:58 +03:00
776516ec0a
DI: people
2019-09-12 10:57:59 +03:00
e0cb81adc4
Merge branch 'master' into refactoring/di
...
# Conflicts:
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
dd1cd3aee4
Api: added confirm auth scheme
2019-09-11 18:53:40 +03:00
1530ec842e
DI: WebImageSupplier,WebItemSettings, SettingsManager
2019-09-11 13:42:52 +03:00
c34db98d6b
suppress warning: NU1701 for release configuration
2019-09-10 18:20:17 +03:00
c50b5b0fc9
csproj: remove pdb file from release build configuration
2019-09-10 16:38:20 +03:00
7cd8e53d2c
Merge branch 'master' into refactoring/di
2019-09-10 16:15:15 +03:00
02efce033f
Api: added confirm auth scheme
2019-09-10 15:42:15 +03:00
31df2011bb
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-10 11:59:23 +03:00
3d01752e93
ASC.People: don't save empty user contacts
2019-09-10 11:53:47 +03:00
0a5ef37043
Getting STORAGE_ROOT from env variable
2019-09-09 18:04:28 +03:00
e2a4311a29
Dependency injection
...
Packages updated
2019-09-09 15:56:33 +03:00
238e103440
Optimization
2019-09-03 15:23:58 +03:00
b7e5a04137
People: fix delete route
2019-09-03 14:10:32 +03:00
a26d8d24ce
Api: added CustomJsonOptionsWrapper. optimization
2019-09-03 12:31:15 +03:00
967068a728
UserInfo: optimization
2019-09-02 18:09:45 +03:00
12747318c6
Optimization
2019-08-30 15:40:57 +03:00
d16d5f1251
Kafka: create only one producer for instance
...
UserPhotoManager: optimization
2019-08-27 17:57:06 +03:00
6cae722b9d
kafka disabled by default
2019-08-23 15:49:23 +03:00
e11a3d0b08
People: fixed count
2019-08-15 18:54:56 +03:00
9e32ad4b6c
IDE0063
2019-08-15 18:08:40 +03:00
58fb60ba65
IDE0007
2019-08-15 16:03:57 +03:00
f6d78d3cba
Code Cleanup
2019-08-15 15:04:42 +03:00
65563552fa
Packages updated
2019-08-15 14:33:57 +03:00
d7376418f8
Removed unused resources
2019-08-13 16:05:36 +03:00
731ddefc82
Added CultureMiddleware and DisposeMiddleware
2019-08-12 15:52:55 +03:00
a26a6db0ea
Api: added settings controller
2019-08-12 13:53:12 +03:00
49b259abff
refactoring
2019-08-09 15:28:19 +03:00
f0d2854071
People: fix search by filter
2019-08-08 17:42:29 +03:00
f85711b736
Optimization
2019-08-08 12:26:58 +03:00
4da674ab75
web: People: Added people.svg
2019-08-05 18:24:34 +03:00
e9c564fda9
People: method "get by filter" optimized
2019-08-05 16:45:33 +03:00
c6a4bad14d
People: fix default avatar's urls
2019-08-05 16:08:27 +03:00
1fd62e757c
Api: RegisterForDispose DisposableHttpContext
2019-08-05 15:37:33 +03:00
8a4807daaa
Api: fix
2019-08-05 10:50:11 +03:00
1de8fd7398
Api: fields
2019-08-02 17:40:33 +03:00
3036e1cb90
Added ASC.Studio.Notify service
2019-08-01 11:47:15 +03:00
7dd4dd5a38
Api: added total
2019-07-29 13:51:14 +03:00
b1a8d574d8
People: api. added userid parameter to UpdateMember method
2019-07-26 14:37:50 +03:00
663093b7e5
People: cache default photo
2019-07-24 15:34:23 +03:00
969a605ad1
Upgrade references
2019-07-24 15:33:14 +03:00
Ilya Oleshko
fd5edef6bc
People: Added return parameter avatarMax
2019-07-24 14:27:32 +03:00
324ac1be9c
Added XmlOutputFormatter
2019-07-24 13:48:45 +03:00
9732fbb83a
People: fixed "status" method
2019-07-24 12:40:26 +03:00
1cbfa2fe71
People: fixed "@self" method
2019-07-24 12:28:39 +03:00
6e500b0986
Upgrade .net core to 3.0.0-preview6
...
Added KafkaCache
2019-07-19 16:10:15 +03:00
4703a70670
Api: fixed context
2019-07-19 11:38:31 +03:00
d045346b73
People: api. Added UploadMemberPhoto method
2019-07-17 11:55:08 +03:00
4f99bacb98
People.Server: removed pages
2019-07-12 17:31:15 +03:00
6c72b154e2
Server: added ForwardedHeaders
2019-07-12 17:28:14 +03:00
6b25d1e98c
People: fixed resources
2019-07-10 12:24:41 +03:00
2bb193b6b8
People: fixed resources
2019-07-10 11:51:24 +03:00
2458bc2944
ASC.People project is divided into two separate parts: Server and Client
2019-07-10 11:21:12 +03:00
