Commit Graph

31 Commits

Author SHA1 Message Date
cefa25a391 refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
72b19da283 Files: fix requests 2021-10-08 12:49:29 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
53c77f5214 Files: fix startedit 2021-10-01 11:04:19 +03:00
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
f18f14fa34 DocumentService: fix 2020-07-16 00:36:48 +03:00
cb1bf99393 Files: fix 2020-07-16 00:25:19 +03:00
f03ab16127 Converter: fix 2020-07-16 00:08:28 +03:00
d99f6ff0a5 Files: additional logging 2020-07-15 23:39:43 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
9d0df35a17 DocumentService log error 2020-07-15 17:58:12 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
73774a29fa IDE0067 2019-08-16 11:44:03 +03:00
28fc76ded9 IDE0066 2019-08-15 18:13:25 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
ddf7c8ddcd IDE0054, IDE0056, IDE0057, IDE1005 2019-08-15 17:48:55 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
531763fa1c Added ASC.Web.Core 2019-06-07 11:59:07 +03:00