SuhorukovAnton
|
f89c3eefe6
|
scope: refactoring
|
2020-07-30 16:33:54 +03:00 |
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +03:00 |
|
|
820117cb04
|
Api: added SaveMailDomainSettings, EnableAdminMessageSettings
|
2020-07-22 14:03:38 +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 |
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
f18f14fa34
|
DocumentService: fix
|
2020-07-16 00:36:48 +03:00 |
|
|
cb1bf99393
|
Files: fix
|
2020-07-16 00:25:19 +03:00 |
|
|
f03ab16127
|
Converter: fix
|
2020-07-16 00:08:28 +03:00 |
|
|
d99f6ff0a5
|
Files: additional logging
|
2020-07-15 23:39:43 +03:00 |
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
|
9d0df35a17
|
DocumentService log error
|
2020-07-15 17:58:12 +03:00 |
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
533935906f
|
Resource: fix
|
2020-07-15 12:55:31 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
SuhorukovAnton
|
6647217371
|
api-defaultvalue: fix
|
2020-07-02 23:51:18 +03:00 |
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
SuhorukovAnton
|
0ec331db76
|
api-defaultvalue: fix
|
2020-06-30 16:56:38 +03:00 |
|
|
b035a6347e
|
Notify: fix
|
2020-06-29 17:49:15 +03:00 |
|
|
feedc8a1b0
|
Core: fix
|
2020-06-29 16:53:55 +03:00 |
|
|
eb6be17333
|
Backup: removed notify reference
|
2020-06-29 12:32:43 +03:00 |
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
155e0b2c9b
|
Backup: fix
|
2020-06-28 14:46:16 +03:00 |
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
f43816738b
|
Files: fix
|
2020-06-22 21:58:16 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
SuhorukovAnton
|
9655101d2b
|
Backup: add DIHelper's methods and fix startup
|
2020-05-28 16:28:51 +03:00 |
|
|
22ae4383b6
|
UrlShortener: fix
|
2020-05-22 13:58:12 +03:00 |
|
|
1700ba1965
|
UrlShortener: config
|
2020-05-22 12:41:14 +03:00 |
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +03:00 |
|
|
7bf739fe09
|
Optimization
|
2020-05-07 14:02:29 +03:00 |
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +03:00 |
|
|
c5ff09ac09
|
Added DI for Voip
|
2020-04-17 17:07:44 +03:00 |
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|
|
1dbdb1aedd
|
Files: configuration
|
2020-04-15 18:39:59 +03:00 |
|
|
a1e1cd17be
|
FileHandler: fix
|
2020-04-15 13:46:24 +03:00 |
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +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 |
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
785cc4c5a3
|
Files: DI
|
2020-02-13 18:12:27 +03:00 |
|
|
c0cc00bfbe
|
Files:DI
|
2020-02-13 15:19:25 +03:00 |
|
|
efef2f696d
|
Files: DI
|
2020-02-12 16:50:38 +03:00 |
|
|
965e8df12b
|
Core: Resources
|
2020-02-11 18:41:40 +03:00 |
|
|
26b6ef0e2c
|
Files: DI
|
2020-02-10 16:06:03 +03:00 |
|
|
67049195f8
|
Files: DI, EF
|
2020-02-05 18:37:31 +03:00 |
|
|
508efb1fca
|
Files: EF, DI
|
2020-02-05 16:33:09 +03:00 |
|
|
ff84afb110
|
Merge branch 'master' into feature/elastic
# Conflicts:
# web/ASC.Web.Core/SetupInfo.cs
|
2020-02-05 11:43:03 +03:00 |
|
|
767448acb9
|
Files: EF, DI
|
2020-02-04 11:41:04 +03:00 |
|
|
b4b8b339ef
|
Web.Core: CommonLinkUtility: fixed profile links
|
2020-02-04 10:02:14 +03:00 |
|
|
671b043b7e
|
Files: GoogleDriveApp
|
2020-02-03 16:31:42 +03:00 |
|
|
51d8b9758c
|
Files: BoxApp
|
2020-02-03 13:41:24 +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 |
|
|
b4ff0c09a7
|
moved from hotfix/10.5.2
|
2020-01-23 14:04:42 +03:00 |
|
|
a93d7adda6
|
moved from hotfix/10.5.2
|
2020-01-23 11:52:07 +03:00 |
|
|
f5b3f2838b
|
moved from hotfix/10.5.2
|
2020-01-22 16:59:49 +03:00 |
|
|
4bad85defe
|
moved from hotfix/10.5.2
|
2020-01-17 16:58:26 +03:00 |
|
|
dd28738907
|
Settings: Added SendOwnerChangeInstructions and ChangeOwner
|
2020-01-15 18:22:43 +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 |
|
|
04d8bf05eb
|
EF: MultiRegionalDbManager
|
2019-12-16 17:55:59 +03:00 |
|
|
08c98691d5
|
EF: GeolocationHelper
|
2019-12-13 16:05:24 +03:00 |
|
|
db5f113480
|
EF: Mail
|
2019-12-13 14:37:58 +03:00 |
|
|
7ebca49738
|
EF: MobileAppInstall
|
2019-12-12 18:24:47 +03:00 |
|
|
2758fb1dfb
|
Merge branch 'master' into feature/ef
|
2019-12-12 17:53:54 +03:00 |
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
6cd6eedde0
|
EF: notify
|
2019-12-11 12:47:55 +03:00 |
|
|
a623670582
|
EF: notify
|
2019-12-10 16:42:29 +03:00 |
|
|
647333b3c2
|
EF: feed
|
2019-12-10 12:05:28 +03:00 |
|
|
33c35b1177
|
Merge branch 'master' into feature/ef
|
2019-12-09 21:46:43 +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 |
|
|
d187c8c82b
|
UserPhotoManager: fixed SearchInCache
|
2019-12-09 15:49:36 +03:00 |
|
|
23838c0401
|
EF: files, Feed
|
2019-12-09 14:59:22 +03:00 |
|
|
b349a46649
|
EF: WebstudioUserVisit
|
2019-12-06 19:01:12 +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 |
|
|
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 |
|
|
711feca435
|
fixed scope
|
2019-11-15 12:28:20 +03:00 |
|
|
68bd46ef33
|
Notify: fixed styler
|
2019-11-12 16:23:15 +03:00 |
|
|
44d6e6e53d
|
Dependencies updated
|
2019-11-12 13:28:30 +03:00 |
|
|
a3bee291a2
|
Added comments
|
2019-11-11 18:45:17 +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 |
|
|
6ac10fac2f
|
ISettings replaced with ISettingsExt
|
2019-11-08 18:11:30 +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 |
|
|
0801877060
|
DI: ASC.Studio.Notify.
Settings: AutoMapper
|
2019-11-01 16:56:47 +03:00 |
|
|
c54f575c26
|
DI: StudioNotifyService
|
2019-11-01 11:49:08 +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 |
|
|
78584b78a3
|
DI: removed LogManager
|
2019-10-22 14:21:44 +03:00 |
|
|
53d2aaa4e3
|
DI: DbManager
|
2019-10-21 16:50:20 +03:00 |
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
09881619b8
|
DI: DbManager
|
2019-10-18 16:29:24 +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 |
|
|
f0e7e2e41b
|
DI: notify
|
2019-10-11 11:31:21 +03:00 |
|
|
85fe70087e
|
DI: CoreConfiguration
|
2019-10-10 16:18:12 +03:00 |
|
|
75285dfc69
|
DI: configuration
|
2019-10-10 13:59:22 +03:00 |
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +03:00 |
|
|
515f7de555
|
DI: Configuration
|
2019-10-09 18:04:46 +03:00 |
|
|
080a343eb5
|
DI: AppSettings
|
2019-10-09 13:09:54 +03:00 |
|
Daniil Senkiv
|
2ed3ee4905
|
Web.Client/Core: added method of deleting self profile
|
2019-10-04 07:58:38 +03:00 |
|
Daniil Senkiv
|
b348c918ad
|
Web.Client: Confirm: added profileRemove page with deletion profile only from admin account
|
2019-10-02 14:52:40 +03:00 |
|
Daniil Senkiv
|
2b087d6e20
|
Web.Client: Confirm: activateEmail: added real api method, fixed generation link
|
2019-09-30 14:30:26 +03:00 |
|
Daniil Senkiv
|
6ebf6afc32
|
Web.Core: StudioNotifyService: fixed generating confirm activation link
|
2019-09-27 17:49:45 +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 |
|
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 |
|
|
94ab6c96aa
|
Notify: check guest
|
2019-09-26 14:54:53 +03:00 |
|
|
22e4d19458
|
PasswordChange: added userId
|
2019-09-26 12:15:01 +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 |
|
|
f247b4a303
|
Notify: fixed resources
|
2019-09-24 19:21:05 +03:00 |
|
|
afb1f90e9a
|
.net core up to 3.0.0
|
2019-09-24 14:20:58 +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 |
|
|
1e946b19b6
|
DI: refactoring
|
2019-09-20 18:53:27 +03:00 |
|
|
8184492a4f
|
DI: ConfigurationManager
|
2019-09-20 18:08:45 +03:00 |
|
|
181e570ce1
|
DI: CommonServiceProvider
|
2019-09-20 16:06:10 +03:00 |
|
|
41b4a909cd
|
DI: TenantManager
|
2019-09-20 15:47:00 +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 |
|
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 |
|
|
409da28d4b
|
DI: SubscriptionManager
|
2019-09-19 16:43:28 +03:00 |
|
|
7ceb117690
|
DI: CoreConfiguration
|
2019-09-19 14:34:54 +03:00 |
|