|
|
17c4cf02fc
|
Merge branch 'master' into feature/files
|
2020-08-27 18:06:05 +03:00 |
|
|
|
be5abb8cd3
|
Files: added settings methods
|
2020-08-27 18:05:21 +03:00 |
|
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-08-20 12:43:12 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
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 |
|
