IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
0a17af12eb
DocSpace-buildtools/common/ASC.Core.Common/EF/Model
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
..
Audit Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
Core rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
CRM Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
Feed rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
Mail Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
Notify rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
Resource Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
Tenant Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
User Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00
AccountLinks.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
DbipLocation.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
DbWebstudioIndex.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
DbWebstudioSettings.cs Merge branch 'develop' into feature/auto-migrations 2021-10-25 20:52:13 +03:00
DbWebstudioUservisit.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
FilesConverts.cs Merge branch 'master' into develop 2021-12-28 18:21:44 +03:00
MobileAppInstall.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ModelBuilderWrapper.cs fix warnings 2020-11-17 13:47:17 +03:00
Regions.cs fix migrations 2021-10-26 16:14:40 +03:00
TelegramUser.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00