|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +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 |
|
|
|
6cdab3daca
|
Notify: fix
|
2020-10-30 18:42:56 +03:00 |
|
|
|
49dd924dc4
|
Notify: fix
|
2020-10-30 18:17:11 +03:00 |
|
|
|
4056ea888a
|
Notify: fix urls
|
2020-10-30 17:57:31 +03:00 |
|
|
|
9d6e1f58ea
|
Notify: fix
|
2020-10-30 12:49:37 +03:00 |
|
|
|
b594986270
|
Notify: fix password change
|
2020-10-30 12:19:14 +03:00 |
|
|
|
3256a3dbc7
|
DI: fix
|
2020-10-28 23:02:03 +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 |
|
|
|
367c93fd91
|
Refactoring: scope
|
2020-10-22 20:57:18 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
b1d50e5702
|
Core: fix DI
|
2020-10-13 11:26:17 +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
|
f618f8799b
|
fix-messages: IDE0062
|
2020-09-30 15:46:16 +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 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
|
|
0000129b3b
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
|
2020-09-20 20:17:12 +03:00 |
|
|
|
9a092cb8ec
|
moved from release/11 4414f77b
|
2020-09-18 17:45:59 +03:00 |
|
|
|
94a5079503
|
Encryption: notify fix
|
2020-09-16 13:50:53 +03:00 |
|
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
|
|
3f37da9891
|
fix notify
|
2020-09-10 12:02:26 +03:00 |
|
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
|
|
96df0ab8ca
|
Api: added payment settings
|
2020-09-07 16:53:39 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
SuhorukovAnton
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
SuhorukovAnton
|
faec4269db
|
Merge branch 'master' into feature/scope
|
2020-08-16 12:23:20 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
SuhorukovAnton
|
f89c3eefe6
|
scope: refactoring
|
2020-07-30 16:33:54 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
SuhorukovAnton
|
6647217371
|
api-defaultvalue: fix
|
2020-07-02 23:51:18 +03:00 |
|
SuhorukovAnton
|
0ec331db76
|
api-defaultvalue: fix
|
2020-06-30 16:56:38 +03:00 |
|
|
|
eb6be17333
|
Backup: removed notify reference
|
2020-06-29 12:32:43 +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 |
|
|
|
a93d7adda6
|
moved from hotfix/10.5.2
|
2020-01-23 11:52:07 +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 |
|
|
|
a623670582
|
EF: notify
|
2019-12-10 16:42:29 +03:00 |
|
|
|
647333b3c2
|
EF: feed
|
2019-12-10 12:05:28 +03:00 |
|
|
|
3dc8c87a94
|
EF: DbTenantService
|
2019-12-03 18:20:21 +03:00 |
|
|
|
68bd46ef33
|
Notify: fixed styler
|
2019-11-12 16:23:15 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
|
6b2f6b0a7b
|
DI: log
|
2019-10-17 18:55:35 +03:00 |
|
|
|
7c05ba927b
|
DI: KafkaCache
|
2019-10-11 18:03:03 +03:00 |
|
|
|
f0e7e2e41b
|
DI: notify
|
2019-10-11 11:31:21 +03:00 |
|
|
|
75285dfc69
|
DI: configuration
|
2019-10-10 13:59:22 +03:00 |
|
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +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 |
|
|
|
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 |
|
|
|
94ab6c96aa
|
Notify: check guest
|
2019-09-26 14:54:53 +03:00 |
|
|
|
22e4d19458
|
PasswordChange: added userId
|
2019-09-26 12:15:01 +03:00 |
|
|
|
dec4bb266e
|
DI: configuration
|
2019-09-24 13:32:12 +03:00 |
|
|
|
6de13b9d50
|
DI: configuration
|
2019-09-23 15:20:08 +03:00 |
|
|
|
1e946b19b6
|
DI: refactoring
|
2019-09-20 18:53:27 +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 |
|
|
|
2f5fe4301e
|
DI: TenantManager
|
2019-09-18 15:14:15 +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 |
|
|
|
e2a4311a29
|
Dependency injection
Packages updated
|
2019-09-09 15:56:33 +03:00 |
|
|
|
238e103440
|
Optimization
|
2019-09-03 15:23:58 +03:00 |
|
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
|
|
39bac7cc64
|
Notify: name removed
|
2019-08-22 18:59:49 +03:00 |
|
|
|
9e32ad4b6c
|
IDE0063
|
2019-08-15 18:08:40 +03:00 |
|
|
|
3cd4131f21
|
IDE0039, IDE0041, IDE0044
|
2019-08-15 17:36:08 +03:00 |
|
|
|
f747e0e4fc
|
IDE0028, IDE0016, IDE0029, IDE0032
|
2019-08-15 16:56:54 +03:00 |
|
|
|
ed7ed484e8
|
IDE0049
|
2019-08-15 16:16:39 +03:00 |
|
|
|
d9be7211f6
|
IDE0018
|
2019-08-15 16:05:50 +03:00 |
|
|
|
58fb60ba65
|
IDE0007
|
2019-08-15 16:03:57 +03:00 |
|
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
|
49b259abff
|
refactoring
|
2019-08-09 15:28:19 +03:00 |
|
|
|
f85711b736
|
Optimization
|
2019-08-08 12:26:58 +03:00 |
|
|
|
00120d88c9
|
Notify: sender queue moved to ASC.Studio.Notify
|
2019-08-02 13:25:33 +03:00 |
|
|
|
807378d216
|
Notify: refactoring
|
2019-08-01 14:44:50 +03:00 |
|
|
|
3036e1cb90
|
Added ASC.Studio.Notify service
|
2019-08-01 11:47:15 +03:00 |
|
|
|
ca6fdb500d
|
Remove HttpContext.Current
|
2019-07-02 18:30:31 +03:00 |
|
|
|
377287570a
|
Added ASC.Feed, ASC.IPSecurity
Added Resources
|
2019-06-14 19:14:24 +03:00 |
|
