maksim
|
c7a3fa85f2
|
Thirdparty: remove reference
|
2020-08-14 16:16:48 +03:00 |
|
maksim
|
c24bdfbbba
|
Merge branch 'master' into feature/thirdparty
|
2020-08-14 16:01:55 +03:00 |
|
maksim
|
4a29a69761
|
feature custom nuget server
|
2020-08-14 13:48:34 +03:00 |
|
|
d6ff0d6a44
|
Merge branch 'master' into feature/files
|
2020-08-12 18:26:28 +03:00 |
|
|
6782269c7f
|
Files: lock file
|
2020-08-12 18:13:52 +03:00 |
|
maksim
|
6782b16413
|
fix: replacing projectreference with packagereference
|
2020-08-12 13:34:19 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
34c2252b25
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-08-02 22:31:52 +03:00 |
|
|
6253b151e1
|
fix ChangeHistory, UpdateFile, added UpdateComment
|
2020-08-02 21:48:58 +03:00 |
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
ddf5aa6f19
|
Files: additional logging
|
2020-07-15 23:18:35 +03:00 |
|
|
531b66875f
|
Files: fix
|
2020-07-15 18:27:46 +03:00 |
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +03:00 |
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
064160a1ea
|
Files: onedrive
|
2020-07-10 18:37:02 +03:00 |
|
|
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 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
|
c9040bd1e3
|
Files: fix CompleteVersion
|
2020-07-09 22:26:00 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
|
71c267939d
|
Files: fix names and Serializers
|
2020-07-09 12:02:44 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
88cad55450
|
api-defaultvalue: delete DataMembers
|
2020-07-07 12:59:12 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +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 |
|
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 |
|