|
040377198f
|
People: filter by employeeTypes
|
2023-07-12 13:10:47 +03:00 |
|
|
986561d4e9
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/services/ASC.ApiSystem/Controllers/PeopleController.cs
# migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2023-06-08 15:53:31 +03:00 |
|
|
6c78438b75
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/RegionHelper.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/GeolocationHelper.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/RadicaleController.cs
# web/ASC.Web.Api/Api/Settings/TfaappController.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
|
2023-05-30 14:13:02 +03:00 |
|
|
845aaa085f
|
Quota: cache by region
|
2023-05-27 19:44:29 +03:00 |
|
|
986361b4a0
|
People: new filter AccountLoginType
|
2023-05-17 11:20:27 +03:00 |
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
d76a2c1552
|
remove tenant
|
2023-04-26 11:25:15 +03:00 |
|
|
4a1e1a88e7
|
add dbTenant in models and rename "tenant" to "tenantid"
|
2023-04-25 00:17:29 +03:00 |
|
|
4f12380445
|
people: update last_modified in core_user table after set user photo
|
2023-04-12 22:27:16 +03:00 |
|
|
dc25ce1162
|
fix async
|
2023-04-07 11:42:03 +03:00 |
|
|
dec0d918d4
|
fix CachedQuotaService.cs
|
2023-04-07 11:06:18 +03:00 |
|
|
e1b01e2d81
|
fix methods with task and without async
|
2023-03-28 13:13:13 +03:00 |
|
|
63ee0ca117
|
UserDbContext - async
|
2023-03-24 10:53:49 +03:00 |
|
|
fc78a0508d
|
TenantDbContext -async part2
|
2023-03-22 11:27:01 +03:00 |
|
|
a3800de721
|
TenantDbContext -async part1
|
2023-03-20 19:16:00 +03:00 |
|
|
405ed839bb
|
CoreDbContext -async
|
2023-03-14 23:44:44 +03:00 |
|
|
0d46e034e7
|
Files.Service: added users module for feed aggregator
|
2023-01-18 18:36:06 +03:00 |
|
|
28e2392e55
|
Core.Common: added clearing cache with user id
|
2022-12-05 14:06:42 +03:00 |
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
972d66e4ea
|
Core.Common: fix invalidate cache
|
2022-10-25 23:15:35 +03:00 |
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
23731e8eab
|
UserQuota: fix
|
2022-09-10 18:07:50 +03:00 |
|
|
1ab51406cd
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-09 18:47:38 +03:00 |
|
|
25ae19d601
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-09 11:52:13 +03:00 |
|
|
f54f31a3d1
|
remove waste asc.core.common
|
2022-09-07 15:45:23 +03:00 |
|
|
9988e86a8c
|
Quota: return used user space
|
2022-09-07 13:44:59 +03:00 |
|
|
1008e1c47e
|
Quota: added users quota row table
|
2022-09-07 02:10:58 +03:00 |
|
|
df96629834
|
Core: fixed user cache
|
2022-08-31 21:06:26 +03:00 |
|
|
ff8e3c38e9
|
removed unnecessary
|
2022-08-25 13:54:11 +03:00 |
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
100e581f1c
|
IDE1006
|
2022-03-25 17:54:34 +03:00 |
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
6a09cf47e9
|
IDE0044
|
2022-03-17 18:07:17 +03:00 |
|
|
80eb1c8257
|
IDE0011
|
2022-03-17 18:01:39 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
8563fbc373
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/CommonApiResponse.cs
# common/ASC.Api.Core/Middleware/ResponseWrapper.cs
# common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
|
2022-02-23 17:37:34 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
e7dfa142d6
|
Subscription: fix
|
2022-02-16 20:34:21 +03:00 |
|
|
aa8e6aef3b
|
Core: intertnal properties replaced by fields
|
2022-02-15 15:30:54 +03:00 |
|
|
809359c85b
|
Core: used file-scoped namespaces
|
2022-02-15 14:52:43 +03:00 |
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|