IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2876ef58ef
DocSpace-client/common/ASC.Common
History
AlexeySafronov 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
..
Caching fix Bug 50254 2021-10-05 22:28:07 +03:00
Collections Optimization 2019-08-30 15:40:57 +03:00
Data Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
DependencyInjection replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
Geolocation EF: GeolocationHelper 2019-12-13 16:05:24 +03:00
Logging BuildAndDeploy 2021-09-23 20:58:39 +03:00
Mapping crm: refactoring. bugfix 2021-05-05 17:09:05 +03:00
Module init commit 2019-05-15 17:56:09 +03:00
Notify Optimization 2019-08-08 12:26:58 +03:00
Properties Code Cleanup 2019-08-15 15:04:42 +03:00
protos Merge branch 'develop' into feature/remove-wq 2021-05-13 11:23:44 +03:00
Security Files: optimization 2021-12-16 15:49:35 +03:00
Threading Backup: fix 2021-05-19 11:31:50 +03:00
Utils Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
Web Moved from 45122194 2021-11-29 14:11:03 +03:00
ASC.Common.csproj Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
ASC.Common.sln init commit 2019-05-15 17:56:09 +03:00
DIHelper.cs fix loading products 2021-10-28 16:07:14 +03:00