|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
fce8d26cef
|
analizators/ca1507
|
2022-01-24 13:49:00 +03:00 |
|
|
fb65d3a09d
|
analizators/1481
|
2022-01-21 16:15:15 +03:00 |
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +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 |
|
|
2bd3a5764d
|
add method GetUserGroupRef, change return type
|
2021-09-28 20:26:16 +03:00 |
|
|
ec66a65d38
|
User: fix request
|
2021-09-10 17:00:26 +03:00 |
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
|
db7e2b8700
|
People: fixed query
|
2021-05-18 16:16:17 +03:00 |
|
|
50d01a646d
|
Core: fixed creating group
|
2021-04-06 21:04:15 +03:00 |
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
d4b736103a
|
Users: fixed queries
|
2020-12-23 13:12:07 +03:00 |
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
|
3a29e9970f
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Server/Startup.cs
|
2020-10-18 22:52:24 +03:00 |
|
|
af1bf4a56e
|
Refactoring: lazy
|
2020-10-18 22:00:38 +03:00 |
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +03:00 |
|
|
c08abfc396
|
User: fix SetUserPasswordHash
|
2020-09-30 15:54:36 +03:00 |
|
|
bfd450e602
|
DbUserService: fix
|
2020-09-30 14:20:54 +03:00 |
|
|
dd80e300d0
|
Common, Core.Common moved from release/11 4414f77b
|
2020-09-15 16:11:05 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
a90b1fb424
|
People: added GetExpression
|
2020-02-25 11:02:13 +03:00 |
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
fbce5f3845
|
DI: HostedSolution
|
2020-02-20 11:05:10 +03:00 |
|
|
7183be383f
|
Core: fixed removing group
|
2020-02-06 18:35:24 +03:00 |
|
|
201bd72624
|
EF: Added ignore case for search users by filter text
|
2020-02-05 16:59:04 +03:00 |
|
|
d2bf5ece2b
|
EF: fixed GetUserGroupRefs
|
2020-01-21 13:52:04 +03:00 |
|
|
f0434a6546
|
People: fixed search by text
|
2019-12-25 18:28:19 +03:00 |
|
NikolayRechkin
|
8122eaffdb
|
EF: added check for null
|
2019-12-19 17:06:18 +03:00 |
|
|
f696558445
|
EF: AddOrUpdate
|
2019-12-17 16:01:59 +03:00 |
|
|
b2002a08db
|
EF: MultiRegionHostedSolution
|
2019-12-17 11:27:38 +03:00 |
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
789d756038
|
EF: Subscription.
|
2019-12-02 15:04:22 +03:00 |
|
|
7e9a5db79d
|
EF: Quota
|
2019-12-02 12:12:16 +03:00 |
|
|
7ce2fa22d4
|
EF: dbAzService
|
2019-11-29 16:47:05 +03:00 |
|
|
1cb1d2ace9
|
EF: TariffService
|
2019-11-29 15:26:53 +03:00 |
|
|
c02a00f7c7
|
EF: di, log
|
2019-11-26 12:31:53 +03:00 |
|
|
e3255fb983
|
EF: optimization
|
2019-11-25 16:04:58 +03:00 |
|
|
538511a4dc
|
EF: options
|
2019-11-25 14:49:21 +03:00 |
|
|
3586867429
|
EF: DbUserService
|
2019-11-25 12:49:12 +03:00 |
|
|
d05565107c
|
EF: init commit
|
2019-11-15 18:04:05 +03:00 |
|
|
8ca3a63e24
|
DI: refactoring
|
2019-10-22 19:08:37 +03:00 |
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +03:00 |
|
|
515ce6dae5
|
People: fixed filter method
|
2019-09-24 15:51:03 +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 |
|