|
|
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 |
|
|
|
98b69d6492
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'last_modified' at row 1
|
2020-08-10 20:17:00 +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 |
|
|
|
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 |
|
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
|
|
87af491e89
|
Feed: FilesModule
|
2020-06-04 13:54:13 +03:00 |
|
|
|
adab38548a
|
Files: Index Service
|
2020-04-28 18:11:10 +03:00 |
|
|
|
b5671cc460
|
Files: Service
|
2020-04-27 19:59:52 +03:00 |
|
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +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 |
|
|
|
30d952b946
|
fix
|
2020-02-21 15:38:04 +03:00 |
|
|
|
7fce0d5de6
|
EF: GetKeys - is now public
|
2020-02-21 14:23:56 +03:00 |
|
|
|
8b29a20411
|
EF: AddOrUpdate now return entity
|
2020-02-21 12:58:40 +03:00 |
|
|
|
671d17c55a
|
EF: Added opportunity to get string query from EF linq
|
2020-02-17 17:43:58 +03:00 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
|
b087949c10
|
Files: init commit
|
2020-01-27 14:15:18 +03:00 |
|
|
|
0ced5c1fda
|
ElasticSearch: first version
|
2020-01-24 16:07:51 +03:00 |
|
|
|
51a9b78749
|
EF: feed. AddOrUpdate
|
2019-12-23 16:36:37 +03:00 |
|
|
|
82cc503636
|
EF: table renamed
|
2019-12-23 15:41:43 +03:00 |
|
|
|
26d02ba215
|
EF: Mail. QuotaError - bool
|
2019-12-23 15:38:26 +03:00 |
|
|
|
618a98e077
|
Merge branch 'feature/ef' of github.com:ONLYOFFICE/AppServer into feature/ef
|
2019-12-23 15:02:07 +03:00 |
|
|
|
2097fcdb32
|
EF: removed comment
|
2019-12-23 15:01:48 +03:00 |
|
NikolayRechkin
|
8122eaffdb
|
EF: added check for null
|
2019-12-19 17:06:18 +03:00 |
|
|
|
fe378e1eef
|
EF: AuditEvent. fix Remove Old Event
|
2019-12-18 15:24:22 +03:00 |
|
|
|
f61fb897ac
|
EF: added Dbfunction
|
2019-12-18 15:22:31 +03:00 |
|
|
|
f696558445
|
EF: AddOrUpdate
|
2019-12-17 16:01:59 +03:00 |
|
|
|
b2002a08db
|
EF: MultiRegionHostedSolution
|
2019-12-17 11:27:38 +03:00 |
|
|
|
04d8bf05eb
|
EF: MultiRegionalDbManager
|
2019-12-16 17:55:59 +03:00 |
|
|
|
f0f6b0a299
|
EF: resourceManager
|
2019-12-16 12:30:01 +03:00 |
|
|
|
08c98691d5
|
EF: GeolocationHelper
|
2019-12-13 16:05:24 +03:00 |
|
|
|
db5f113480
|
EF: Mail
|
2019-12-13 14:37:58 +03:00 |
|
|
|
b3c64af077
|
EF: files renamed
|
2019-12-12 18:33:48 +03:00 |
|
|
|
7ebca49738
|
EF: MobileAppInstall
|
2019-12-12 18:24:47 +03:00 |
|
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
|
a4cfdb173c
|
EF: fix
|
2019-12-10 18:31:37 +03:00 |
|
|
|
5d7f58cc2c
|
EF: refactoring
|
2019-12-10 18:06:51 +03:00 |
|
|
|
aed98bea9a
|
EF: ipRestriction
|
2019-12-10 17:47:48 +03:00 |
|
|
|
a623670582
|
EF: notify
|
2019-12-10 16:42:29 +03:00 |
|
|
|
6466aa9fc4
|
EF: Feed
|
2019-12-10 13:01:45 +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 |
|
|
|
8ad3b1ca1d
|
"DeleteOldEvents" temporary removed
|
2019-12-06 13:32:10 +03:00 |
|
|
|
74cb7e9582
|
EF: MessagingSystem
|
2019-12-05 11:51:28 +03:00 |
|
|
|
cb8d7ed191
|
EF: AccountLinker
|
2019-12-04 14:40:42 +03:00 |
|
|
|
d081c18c76
|
EF: settings
|
2019-12-04 12:04:32 +03:00 |
|
|
|
3dc8c87a94
|
EF: DbTenantService
|
2019-12-03 18:20:21 +03:00 |
|
|
|
36098aee2e
|
EF: rename
|
2019-12-02 15:22:40 +03:00 |
|
|
|
37449e0221
|
EF: classes moved to folder
|
2019-12-02 15:18:42 +03:00 |
|
|
|
789d756038
|
EF: Subscription.
|
2019-12-02 15:04:22 +03:00 |
|
|
|
7e9a5db79d
|
EF: Quota
|
2019-12-02 12:12:16 +03:00 |
|
|
|
7ce2fa22d4
|
EF: dbAzService
|
2019-11-29 16:47:05 +03:00 |
|
|
|
1cb1d2ace9
|
EF: TariffService
|
2019-11-29 15:26:53 +03:00 |
|
|
|
ae26212d5f
|
EF: Configuration
|
2019-11-26 18:01:45 +03:00 |
|
|
|
c02a00f7c7
|
EF: di, log
|
2019-11-26 12:31:53 +03:00 |
|
|
|
e3255fb983
|
EF: optimization
|
2019-11-25 16:04:58 +03:00 |
|
|
|
538511a4dc
|
EF: options
|
2019-11-25 14:49:21 +03:00 |
|
|
|
3586867429
|
EF: DbUserService
|
2019-11-25 12:49:12 +03:00 |
|
