Commit Graph

215 Commits

Author SHA1 Message Date
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +03:00
f5348c3ccd Files: settings. Added settings, forcesave, thirdparty 2020-08-31 15:41:28 +03:00
be5abb8cd3 Files: added settings methods 2020-08-27 18:05:21 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +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
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
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
ff41b28a64 DI: files fix 2020-07-16 12:08:20 +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
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
13efc06874 Files: fix 2020-07-03 14:19:45 +03:00
ded7034ba7 Files: fix convert 2020-07-03 13:36:31 +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