|
|
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 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +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 |
|
|
|
dc93975a51
|
fixed check confirm method
|
2020-07-02 19:14:03 +03:00 |
|
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
|
|
b035a6347e
|
Notify: fix
|
2020-06-29 17:49:15 +03:00 |
|
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
|
b617257887
|
Notify: back rename
|
2020-06-28 14:08:12 +03:00 |
|
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
SuhorukovAnton
|
4e839c9b11
|
Backup: transfer to ASC.Data.Backup
|
2020-06-23 13:48:36 +03:00 |
|
|
|
78593b8c1f
|
UserManager: fix
|
2020-06-17 12:53:12 +03:00 |
|
|
|
b36dac0cb4
|
Backup: fix
|
2020-06-16 19:04:40 +03:00 |
|
|
|
b94e4fbeac
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-16 18:00:38 +03:00 |
|
|
|
b35a60cac0
|
Backup: added DeleteBackupRequest
|
2020-06-16 17:46:10 +03:00 |
|
|
|
dedd754875
|
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
|
2020-06-16 17:44:56 +03:00 |
|
|
|
fc0826b60d
|
Backup: service, progress
|
2020-06-16 14:34:44 +03:00 |
|
|
|
38c40eec05
|
Merge branch 'master' into feature/backup
|
2020-06-15 18:40:26 +03:00 |
|
|
|
09e7a81e9b
|
UserManager: fix
|
2020-06-15 18:39:52 +03:00 |
|
|
|
9276bfd384
|
Backup: fix
|
2020-06-15 18:33:53 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
|
31fc052531
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:54:35 +03:00 |
|
|
|
344916b395
|
TenantManager: fix
|
2020-06-09 10:54:05 +03:00 |
|
SuhorukovAnton
|
af2295f98a
|
Backup: fix
|
2020-06-08 13:40:26 +03:00 |
|
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
|
|
87af491e89
|
Feed: FilesModule
|
2020-06-04 13:54:13 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
|
|
d6274ea3e0
|
Added Feed.Aggregator
|
2020-06-03 17:53:58 +03:00 |
|
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
|
|
4544469dca
|
TenantManager: add TenantHolder
|
2020-06-01 13:55:26 +03:00 |
|
SuhorukovAnton
|
9655101d2b
|
Backup: add DIHelper's methods and fix startup
|
2020-05-28 16:28:51 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +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 |
|
|
|
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 |
|
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +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 |
|
|
|
63ecb8fc87
|
Consumers: fix
|
2020-04-16 14:33:35 +03:00 |
|
|
|
978cf0e34e
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
|
2020-03-19 16:07:16 +03:00 |
|
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +03:00 |
|
|
|
c780a881df
|
Files: fixed removing file method
|
2020-03-04 10:42:43 +03:00 |
|
|
|
46ae46dcd1
|
Files: fixed start services
|
2020-02-27 11:44:55 +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 |
|
|
|
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 |
|
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
|
1caab63fbc
|
HostedSolution: DI
|
2020-02-20 11:16:58 +03:00 |
|
|
|
fbce5f3845
|
DI: HostedSolution
|
2020-02-20 11:05:10 +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 |
|
|
|
785cc4c5a3
|
Files: DI
|
2020-02-13 18:12:27 +03:00 |
|
|
|
3fa9046bec
|
Merge branch 'master' into feature/elastic
|
2020-02-11 14:08:26 +03:00 |
|
|
|
3c23e2f4a7
|
Files: DI
|
2020-02-07 13:29:16 +03:00 |
|
|
|
7183be383f
|
Core: fixed removing group
|
2020-02-06 18:35:24 +03:00 |
|
|
|
201bd72624
|
EF: Added ignore case for search users by filter text
|
2020-02-05 16:59:04 +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 |
|
|
|
8c2b39406f
|
Merge branch 'master' into feature/merge
|
2020-02-03 14:29:41 +03:00 |
|
|
|
7a9b02abdb
|
TreatWarningsAsErrors=false
|
2020-02-03 14:27:41 +03:00 |
|
|
|
709343fc17
|
fixed removing from group
|
2020-02-03 14:27:13 +03:00 |
|
|
|
51d8b9758c
|
Files: BoxApp
|
2020-02-03 13:41:24 +03:00 |
|
|
|
acde301b26
|
Merge branch 'master' into feature/merge
|
2020-01-31 10:59:00 +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 |
|
|
|
d2bf5ece2b
|
EF: fixed GetUserGroupRefs
|
2020-01-21 13:52:04 +03:00 |
|
|
|
011972be6f
|
fixed method set people admin
|
2020-01-21 12:03:25 +03:00 |
|
|
|
84062bc0c4
|
EF: fixed argumentNullException
|
2020-01-20 18:09:52 +03:00 |
|
|
|
4bad85defe
|
moved from hotfix/10.5.2
|
2020-01-17 16:58:26 +03:00 |
|
|
|
ce6dfdf7e0
|
moved from hotfix/10.5.2
|
2020-01-17 12:25:22 +03:00 |
|
|
|
dd28738907
|
Settings: Added SendOwnerChangeInstructions and ChangeOwner
|
2020-01-15 18:22:43 +03:00 |
|
|
|
e4c1de4494
|
Core: Common: Fix "Sequence contains more than one matching element" on get TenantQuota
|
2019-12-26 10:13:09 +03:00 |
|
|
|
f0434a6546
|
People: fixed search by text
|
2019-12-25 18:28:19 +03:00 |
|
|
|
a8f8b63414
|
EF: removed old classes
|
2019-12-23 17:57:21 +03:00 |
|
|
|
04be312da4
|
EF: tenants. Use entity
|
2019-12-23 17:26:38 +03:00 |
|
|
|
51a9b78749
|
EF: feed. AddOrUpdate
|
2019-12-23 16:36:37 +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 |
|
|
|
496854b0d1
|
Consumer: rename param name to key
|
2019-12-23 15:57:09 +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 |
|
|
|
65870f460b
|
Removed unused elements
|
2019-12-20 14:27:03 +03:00 |
|
|
|
89efaf9d26
|
Consumers: added config
|
2019-12-20 14:17:01 +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 |
|
|
|
6cd6eedde0
|
EF: notify
|
2019-12-11 12:47:55 +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 |
|
|
|
b4e5ac2e80
|
EF up to 3.1.
|
2019-12-06 13:31:24 +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 |
|
|
|
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 |
|
|
|
cbbaf1847c
|
EF: removed DbBaseService
|
2019-12-03 18:28:27 +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 |
|
|
|
997cfa5fda
|
EF: Updated Dependencies. Optimized logging and userPhotoManager
|
2019-11-29 12:22:20 +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 |
|
|
|
d05565107c
|
EF: init commit
|
2019-11-15 18:04:05 +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 |
|
|
|
02663dbf0c
|
Fixed object disposed exception
|
2019-11-12 13:40:02 +03:00 |
|
|
|
44d6e6e53d
|
Dependencies updated
|
2019-11-12 13:28:30 +03:00 |
|
|
|
d3c696bb9e
|
Common: fixed NullReferenceException
|
2019-11-12 11:32:24 +03:00 |
|
|
|
e9b6976187
|
Renamed all "*factory" classes to "*Extension"
|
2019-11-11 14:50:46 +03:00 |
|
|
|
09406eccf4
|
renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension
|
2019-11-11 14:22:11 +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 |
|
