4a1e1a88e7
add dbTenant in models and rename "tenant" to "tenantid"
2023-04-25 00:17:29 +03:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
90fdd58d1c
Core: added collaborator group and type
2023-02-17 11:27:27 +03:00
0d46e034e7
Files.Service: added users module for feed aggregator
2023-01-18 18:36:06 +03:00
426a11d080
Merge branch 'develop' into release/rc-v1.2.0
2022-12-12 19:33:41 +03:00
6e45bc5aa8
removed unused variables
2022-12-09 16:34:00 +03:00
52f77ac06b
Common: added interface IRuleData
2022-12-06 01:48:02 +03:00
bacde66b72
Merge branch 'develop' into feature/users-payments-filter
2022-11-29 22:24:50 +03:00
7e633c8e70
Core: added payments filter
2022-11-10 17:13:33 +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
d54a2fc79e
rename file
2022-10-27 15:33:06 +03:00
22d800afcd
Core.Common: added new type
2022-10-25 23:15:57 +03:00
afc9d1ce17
Merge branch 'develop' into feature/remove-waste
2022-10-19 14:18:52 +03:00
a2d144514d
refactor
2022-10-18 14:22:02 +03:00
65a066b61e
fix merge
2022-10-17 16:21:09 +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
4ebd5323c0
Quota: fix
2022-10-06 15:55:47 +03:00
cfb0c957e9
Quota: user quota storage core_user -> webstudio_settings
2022-09-15 15:38:31 +03:00
14dfc1f5a7
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
2022-09-13 00:41:59 +03:00
068e3c051b
Quota: Quota limit string -> long
2022-09-13 00:40:10 +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
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
933a4129fa
Quota: string representation of quota
2022-08-29 20:20:58 +03:00
953faf550e
Quota: user quota init
2022-08-23 09:44:07 +03:00
8d89d8e8f2
Common: added dbcontext pool
2022-07-28 15:29:03 +03:00
b98524532f
Merge branch 'develop' into feature/migrations-fix
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-19 16:04:29 +03:00
a2037eb91d
fix build
2022-07-18 18:30:08 +03:00
Vashchuk Nikita
e49d082fa3
Merge branch 'develop' into feature/migrations-fix
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
2022-07-11 13:28:49 +03:00
Vashchuk Nikita
4628769136
fix Contexts,
...
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
2022-07-08 14:24:18 +03:00
1218d31a42
enum generator
2022-07-05 16:58:11 +03:00
a861268e4f
moved from ddf515b8
2022-06-01 17:07:08 +03:00
e7886aff2c
Log: refactoring
2022-05-26 12:01:54 +03:00
a66c03aa86
Merge branch 'develop' into feature/logger-refactoring
...
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
cff4f0188b
migrate from MemoryCache.Default to IMemoryCache
2022-05-18 19:07:09 +03:00
92c6844810
fix
2022-05-06 10:58:15 +03:00
b4ed3ecef4
add loggers in core.common
2022-05-05 17:13:47 +03:00
89059cf32e
Structured Logging
2022-04-28 12:15:33 +03:00
13bbce8ea4
Custom logger replaced with Microsoft.Extensions.Logging
2022-04-26 20:53:48 +03:00
97b45d3bd5
ILog: refactoring
2022-04-25 21:02:18 +03:00
f138ff7c79
fixed warnings
2022-04-14 22:23:57 +03:00
abae61f2db
IDE1006
2022-03-25 19:26:06 +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