|
|
02dd1e9e31
|
Merge branch 'master' into feature/urlshortener
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
|
2020-05-20 18:18:31 +03:00 |
|
|
|
85cec8fff2
|
ApiSystem: fix autofac
|
2020-05-20 16:06:35 +03:00 |
|
|
|
a064da49f4
|
Files: fix OpenEdit
|
2020-05-20 12:58:40 +03:00 |
|
|
|
cee180669b
|
Files: added FileEntryWrapperConverter
|
2020-05-20 11:27:20 +03:00 |
|
|
|
497e959457
|
Merge pull request #29 from ONLYOFFICE/feature/apisystem
Feature/apisystem
|
2020-05-19 22:16:12 +03:00 |
|
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
|
627dd8a97d
|
ApiSystem: fix
|
2020-05-19 16:22:47 +03:00 |
|
|
|
b29b11ad0f
|
Merge branch 'master' into feature/apisystem
# Conflicts:
# ASC.Web.sln
|
2020-05-19 14:45:24 +03:00 |
|
|
|
6d9990abfd
|
Merge pull request #37 from ONLYOFFICE/feature/system-json
Feature/system json
|
2020-05-18 15:45:29 +03:00 |
|
|
|
bb6f32e36a
|
Api: fix
|
2020-05-18 15:08:03 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
7e387cf51a
|
Files: fix
|
2020-05-18 11:59:37 +03:00 |
|
|
|
f0adf6d38e
|
FileOperation: ProgressStep fixed
|
2020-05-18 10:43:53 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
2424924eed
|
Files: optimization
|
2020-05-17 21:11:56 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
78442cd9eb
|
Files: Service fix
|
2020-05-15 14:02:05 +03:00 |
|
|
|
19a43e461a
|
Files: createindex fixed
|
2020-05-15 12:57:40 +03:00 |
|
|
|
93f6771f48
|
Files: serializer
|
2020-05-14 18:52:06 +03:00 |
|
|
|
c47bcebff3
|
Core: removed Custom Resolver
|
2020-05-14 18:51:22 +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 |
|
|
|
8aaf528f2a
|
Elastic: CreateIfNotExist
|
2020-05-14 17:03:24 +03:00 |
|
|
|
28c09d37f2
|
Files: fixed DbFilesSecurity keys
|
2020-05-14 15:43:56 +03:00 |
|
|
|
17a88df5ac
|
Files: fix download
|
2020-05-14 13:47:53 +03:00 |
|
|
|
75388f19d2
|
Merge pull request #36 from ONLYOFFICE/feature/files-index
Feature/files index
|
2020-05-14 12:44:32 +03:00 |
|
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +03:00 |
|
|
|
6bf191b161
|
AddFilesWrapperService -> AddFactoryIndexerFileService, AddFolderWrapperService -> AddFactoryIndexerFolderService,
|
2020-05-08 18:15:08 +03:00 |
|
|
|
74e851e01b
|
ElasticSearch: fixed MatchAll
|
2020-05-08 18:10:53 +03:00 |
|
|
|
cd70aebb0c
|
Elastic: removed unused classes
|
2020-05-08 17:04:05 +03:00 |
|
|
|
90d93db14c
|
FileService: bat and launchSettings
|
2020-05-08 11:35:04 +03:00 |
|
|
|
4160f42d27
|
Files: fixed upload
|
2020-05-07 14:33:12 +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 |
|
|
|
eab3a9b2bd
|
Files: fixed download
|
2020-05-06 19:55:10 +03:00 |
|
|
|
c077f0d1d4
|
Files: added SecurityInfoModel
|
2020-05-06 18:10:27 +03:00 |
|
|
|
7cc06c2322
|
ElasticSearch: state
|
2020-05-06 14:32:26 +03:00 |
|
|
|
02b33bc07b
|
Merge branch 'master' into feature/files-index
# Conflicts:
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-05-06 11:54:26 +03:00 |
|
|
|
1526d8e502
|
Common: removed StreamCopyTo
|
2020-05-06 11:41:27 +03:00 |
|
|
|
79e2387da4
|
Files: fixed trash folder
|
2020-05-06 10:20:10 +03:00 |
|
|
|
f8812bdc05
|
ElasticSearch: reindex
|
2020-05-05 20:40:24 +03:00 |
|
|
|
af7fb87e73
|
Elastic: settings
|
2020-05-03 18:50:40 +03:00 |
|
|
|
1a269749fc
|
Files: fix removing
|
2020-04-30 16:34:15 +03:00 |
|
|
|
bac295c589
|
Files: fix remove operation
|
2020-04-30 14:09:27 +03:00 |
|
|
|
9a7d7ac7c6
|
Files: fixed transaction
|
2020-04-30 11:56:55 +03:00 |
|
|
|
7ffd2c702f
|
Files: search
|
2020-04-29 19:01:38 +03:00 |
|
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
|
bcfbac05c6
|
ElastiSearch: removed Wrapper, WrapperWithDoc
|
2020-04-29 11:04:19 +03:00 |
|
|
|
b9a432cb89
|
Files: removed FilesWrapper, FolderWrapper
|
2020-04-28 20:32:51 +03:00 |
|
|
|
adab38548a
|
Files: Index Service
|
2020-04-28 18:11:10 +03:00 |
|
|
|
c51b40247a
|
Files: service replaced
|
2020-04-27 20:02:15 +03:00 |
|
