Commit Graph

1382 Commits

Author SHA1 Message Date
3da549264e Merge branch 'master' into feature/data-storage-migration 2020-08-28 18:46:20 +03:00
be5abb8cd3 Files: added settings methods 2020-08-27 18:05:21 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
7f9dc150ed Files: revert 2020-08-14 18:00:40 +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
58fffc1756 File: fix revision 2020-08-14 11:35:34 +03:00
cbf9630d7f File: added Locked, LockedBy 2020-08-13 11:52:59 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
3a37e0839a Files: fix FileShareLink 2020-08-12 17:34:54 +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
a9e8c89240 Files: fix add tag 2020-08-04 10:30:09 +03:00
1701db1a91 Files: fix CompleteVersion 2020-08-03 18:28:34 +03:00
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
18b2935c12 fix merge 2020-07-29 14:52:37 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
4681fb0f78 fix 2020-07-16 16:02:21 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
ff41b28a64 DI: files fix 2020-07-16 12:08:20 +03:00
SuhorukovAnton
6da23f477b ASC.Files.Core: refactoring 2020-07-15 18:07:34 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +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
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
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
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
2b4d853b77 Files: fix 2020-07-04 12:46:01 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
6c0b91a836 Files: converter fix 2020-07-03 18:33:40 +03:00
b9b938cdf8 Files: fix convert 2020-07-03 17:47:01 +03:00
9440367b3a FileConvert: fix 2020-07-03 17:37:14 +03:00
98b007fe35 Files: fix CheckConversion 2020-07-03 14:48:56 +03:00