Commit Graph

230 Commits

Author SHA1 Message Date
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
56df9a98ef Files: resources 2020-07-10 14:57:42 +03:00
c9040bd1e3 Files: fix CompleteVersion 2020-07-09 22:26:00 +03:00
6cc564b716 Merge branch 'master' into feature/files 2020-07-04 12:47:53 +03:00
2b4d853b77 Files: fix 2020-07-04 12:46:01 +03:00
81ace5028d Merge branch 'master' into feature/files 2020-07-03 18:34:27 +03:00
6c0b91a836 Files: converter fix 2020-07-03 18:33:40 +03:00
9a2c382dfc Merge branch 'master' into feature/files 2020-07-03 17:47:29 +03:00
b9b938cdf8 Files: fix convert 2020-07-03 17:47:01 +03:00
c318086fca Merge branch 'master' into feature/files 2020-07-03 17:37:49 +03:00
9440367b3a FileConvert: fix 2020-07-03 17:37:14 +03:00
7cba451f89 Merge branch 'master' into feature/files 2020-07-03 14:49:26 +03:00
98b007fe35 Files: fix CheckConversion 2020-07-03 14:48:56 +03:00
be99a345f7 Merge branch 'master' into feature/files 2020-07-03 14:24:47 +03:00
13efc06874 Files: fix 2020-07-03 14:19:45 +03:00
2b6ef1e745 Merge branch 'master' into feature/files 2020-07-03 13:37:09 +03:00
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
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
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