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
..
common	Change location of dotnet file	2021-11-11 15:37:59 +03:00
deb/debian	Add support to deb package (#266)	2021-09-30 15:05:43 +03:00
docker	Modify docker document server run config (#476)	2021-12-06 15:21:06 +03:00
OneClickInstall	Add hardware check in deb and rpm OneClickInstall (#479)	2021-12-10 16:26:34 +03:00
rpm/SPECS	Add support to deb package (#266)	2021-09-30 15:05:43 +03:00
snap	snap: delete obsolete files	2019-09-10 16:45:51 +03:00
win	win: init commit	2019-09-10 18:20:33 +03:00
install.bat	refactoring build scripts	2021-10-26 16:14:34 +03:00
uninstall.bat	fixed started services	2021-10-26 20:09:19 +03:00