Commit Graph

17 Commits

Author SHA1 Message Date
9bccfa3ade refactoring: add globalUsing: core.common 2022-01-26 13:43: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
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
6c5d0d8940 add GetUserGroupRef 2021-09-28 20:32:22 +03:00
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
f0d2854071 People: fix search by filter 2019-08-08 17:42:29 +03:00
e9c564fda9 People: method "get by filter" optimized 2019-08-05 16:45:33 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00