Commit Graph

277 Commits

Author SHA1 Message Date
ded7034ba7 Files: fix convert 2020-07-03 13:36:31 +03:00
151ec90f4c Merge branch 'master' into feature/files 2020-07-03 11:35:09 +03:00
479a4e5896 Files: additional logging 2020-07-03 11:34:36 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
c9a64ca377 Added NullIfDefault 2020-07-02 18:15:52 +03:00
SuhorukovAnton
5737eca3ad api-defaultvalue: fix 2020-07-02 15:50:31 +03:00
SuhorukovAnton
02729b9b37 api-defaultvalue: fix 2020-07-02 10:27:25 +03:00
SuhorukovAnton
cb0cbf99a4 api-defaultvalue: fix 2020-07-02 10:24:01 +03:00
SuhorukovAnton
d185a6143c api-defaultvalue: fix 2020-07-02 10:20:41 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
SuhorukovAnton
4ba2223fa1 Merge branch 'master' into feature/api-defaultvalue 2020-06-29 14:20:24 +03:00
SuhorukovAnton
06cc93223f api-defaultvalue-fix 2020-06-29 14:16:23 +03:00
SuhorukovAnton
6869d7c8d1 api-defaultvalue: fix 2020-06-29 13:37:53 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
da91c97809 Files: added new for subfolder 2020-06-28 19:02:09 +03:00
90aad433a0 Files: fix getshare 2020-06-28 18:45:01 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
SuhorukovAnton
51be59740e api-defaultvalue 2020-06-26 15:48:41 +03:00
SuhorukovAnton
fc4f073a9b api-defaultvalue: fix 2020-06-26 12:59:39 +03:00
SuhorukovAnton
debb0d2193 api-defaultvalue: first version 2020-06-26 12:53:26 +03:00
5319b905e6 Merge branch 'master' into feature/files 2020-06-26 10:54:17 +03:00
3a00f3e9d0 Files: fix GetNewItems 2020-06-26 10:45:24 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
83b05c5b64 Files: added news 2020-06-25 20:17:24 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
f4e8912cc2 Merge branch 'master' into feature/files 2020-06-25 12:34:11 +03:00
0d2dc08ef8 Files: added new 2020-06-25 12:31:35 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
4819c535b6 Merge branch 'master' into feature/files 2020-05-29 00:18:02 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
a61103e0f8 Merge branch 'master' into feature/files 2020-05-20 12:59:32 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
68dfa9dcd7 Merge branch 'master' into feature/files 2020-05-20 11:27:52 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
609290dcd9 Merge branch 'master' into feature/files 2020-05-18 12:03:38 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51: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
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
aeef09bbc1 Merge branch 'master' into feature/files 2020-05-15 12:58:43 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
93f6771f48 Files: serializer 2020-05-14 18:52:06 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +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
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
1746b3c361 Files: fixed video conversion 2020-05-09 21:06:53 +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
f547df107e Merge branch 'master' into feature/files 2020-05-07 14:40:51 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
aff67cbc03 Merge branch 'master' into feature/files 2020-05-07 09:16:25 +03:00
eab3a9b2bd Files: fixed download 2020-05-06 19:55:10 +03:00
05d194ba6e Merge branch 'master' into feature/files 2020-05-06 18:22:02 +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
Ilya Oleshko
5aae59fb21 Merge branch 'master' into feature/files 2020-05-06 10:28:36 +03:00
79e2387da4 Files: fixed trash folder 2020-05-06 10:20:10 +03:00
bee4693566 Merge branch 'master' into feature/files 2020-04-30 16:37:57 +03:00
1a269749fc Files: fix removing 2020-04-30 16:34:15 +03:00
324ea4f8cf Merge branch 'master' into feature/files 2020-04-30 14:19:13 +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