Commit Graph

571 Commits

Author SHA1 Message Date
96834370d8 RabbitMQ: update version. refactoring 2023-08-08 14:43:29 +03:00
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2023-08-01 11:39:57 +03:00
6b4517b5dc Fix bug 63112 2023-06-29 19:04:20 +03:00
a5ee8e3824 nlog: update dll 2023-06-15 16:55:43 +03:00
e3681c243f ASC.Common: replace deprecated .dll 2023-06-14 15:56:11 +03:00
6d01b26ca5 redis: bugfixed 2023-05-31 13:13:26 +03:00
ea23868aea fix 2023-05-31 11:28:33 +03:00
ea70be9ba7 redis: force raise cache notify 2023-05-30 19:32:27 +03:00
a246b02c2c distributedTaskQueue: fixed unused subscription 2023-05-30 19:31:16 +03:00
c0547f5887 DistributedTaskQueue: fixed removing orphan tasks 2023-05-30 13:16:12 +03:00
0338a029e8 Payments: fixed price for eu 2023-05-15 19:30:14 +03:00
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
aa708c8877 added more descriptions and data types 2023-04-25 19:23:54 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
239a117cdf fixed bug 62100. created redis key with Invariant Culture 2023-04-17 16:48:45 +03:00
6934ee79bc thumbnails: refactoring, optimization 2023-03-04 19:58:45 +03:00
f95c56198e thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring 2023-03-03 22:49:36 +03:00
f8af64e9d6 ASC.Common.Threading: extension for channel 2023-03-03 22:00:20 +03:00
72b3b351da Common: refactor 2023-02-17 16:29:13 +03:00
e9ed1cf5b2 Common: added collaborator role 2023-02-17 11:26:34 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
a1daacb4d0 fix 2022-12-21 12:38:47 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
52f77ac06b Common: added interface IRuleData 2022-12-06 01:48:02 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
5e253bb9c8 set region when start app 2022-11-30 19:03:44 +03:00
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
78bbd45fdc DI: optimization 2022-11-25 17:00:49 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
ee04a7a55c removed unused dependencies 2022-11-24 14:40:13 +03:00
ca5e0e4d1e fix 2022-11-16 11:18:24 +03:00
61b401d906 fix 2022-11-15 13:28:25 +03:00
9dfcd25033 backend: update dependency dll 2022-11-14 14:11:10 +03:00
aa0222f078 Merge branch 'develop' into feature/migration_personal 2022-11-11 15:05:26 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +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
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
606e851a34 FileOperation inherited DistributedTaskProgress 2022-11-01 18:44:05 +03:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
a414d68182 Merge branch 'develop' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
#	common/ASC.Data.Storage/StorageFactory.cs
2022-10-28 12:16:36 +03:00
0f3490b977 DoJob return task 2022-10-27 14:14:41 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00