Commit Graph

3984 Commits

Author SHA1 Message Date
3f27bb6ce5 Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
d9fcfe1eab ASC.Data.Reassigns: fixed RemoveProgressItem 2023-07-12 13:37:30 +03:00
0026f990fd ASC.Data.Reassigns: splited the ReassignStorageAsync method into parts 2023-07-12 13:34:30 +03:00
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
ab592bb7c9 People: added IsRoomAdmin field 2023-07-12 00:50:47 +03:00
812010a8af added translations 2023-07-11 18:22:23 +03:00
097b89b42f Merge branch 'release/v1.1.0' into feature/csp 2023-07-11 16:30:42 +03:00
b3afd051af Csp: lua script, CspSettingsHelper, portalrename, dns change, domains array 2023-07-11 16:21:48 +03:00
3e18110da9 added translations 2023-07-10 18:16:31 +03:00
d231ad2577 fix DbWorker 2023-07-10 10:53:53 +03:00
5b55e67514 Merge branch 'develop' into feature/web-plugins 2023-07-10 09:40:46 +03:00
805d0160a3 Modify web plugin service for test API 2023-07-10 09:32:52 +03:00
72b750e3bc ASC.Data.Reassigns: fix 2023-07-08 10:12:47 +03:00
69bce9c0bb ASC.Data.Reassigns: fix 2023-07-07 16:41:46 +03:00
cb805f59c1 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-07 14:32:02 +03:00
62e6431605 added translations 2023-07-07 14:31:42 +03:00
a0efa6c115 SocketIO: added user and password support for redis 2023-07-07 14:14:22 +03:00
91fc1f0c04 ASC.Core.Common: DbUserService: fixed ObjectDisposedException 2023-07-07 12:56:09 +03:00
f8acd8f647 added translations 2023-07-06 16:36:28 +03:00
a85a8215e8 Merge branch 'develop' into feature/web-plugins 2023-07-06 10:27:01 +03:00
cbf7971cd3 added translations 2023-07-05 17:22:56 +03:00
59b9980fd1 Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-fixes
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2023-07-05 16:09:00 +03:00
04f06d43a7 ASC.Migrations.Core: added web plugins to MigrationContext 2023-07-05 15:28:39 +03:00
18ba106440 ASC.Api.Core: register dbcontext for web plugins 2023-07-05 12:21:58 +03:00
c8672b444b ASC.Core.Common: EF: added model, dbcontext and dbservice for web plugins 2023-07-05 12:20:40 +03:00
4d0c17d396
Merge pull request #1507 from ONLYOFFICE/feature/tenantcookie
Feature/tenantcookie
2023-07-05 06:53:01 +04:00
e634285b97 fix Bug 63003 2023-07-05 00:03:44 +03:00
a6954a3764 added translations 2023-07-04 18:07:50 +03:00
506544ea7c Merge branch 'release/v1.1.0' into feature/tenantcookie 2023-07-04 13:12:09 +04:00
220a21fe4f fixed quota 2023-07-03 20:07:00 +03:00
cfe7c589f6 fixed quota 2023-07-03 19:39:35 +03:00
3c9a253639 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-03 17:19:35 +03:00
725310d472 added translations 2023-07-03 17:18:59 +03:00
89a609dd5e Merge branch 'develop' into feature/ipsecurity-fixes 2023-07-03 13:22:25 +03:00
045259a9f2
Merge pull request #1499 from ONLYOFFICE/feature/docker-dev
Add docker runtime build images for develop
2023-07-03 14:13:33 +04:00
3889e95c63 TenantCookieSettings: check enabled 2023-07-03 12:53:51 +03:00
6921f945bc Build: Refactoring publish with profiles 2023-07-03 12:28:03 +04:00
2c540aed25 Publish: Added publish profiles for Unix 2023-07-03 00:53:29 +04:00
ed2a2ea9ec Server: Added publish profiles for "ASC.Files", "ASC.People", "ASC.Data.Backup", "ASC.Files.Service", "ASC.Notify", "ASC.Studio.Notify", "ASC.Web.Api", "ASC.Web.Studio", "ASC.Data.Backup.BackgroundTasks", "ASC.ClearEvents", "ASC.ApiSystem", "ASC.Web.HealthChecks.UI" 2023-07-02 12:51:28 +03:00
0ff6e98473 TenantCookieSettings: lifetime is now 1440 by default. added "default" property 2023-06-30 19:07:18 +03:00
1d3534ab46 fixed query 2023-06-30 14:57:19 +03:00
2b1295455c fix 2023-06-30 14:35:08 +03:00
20300337f3 fix query 2023-06-30 12:41:20 +03:00
164792e924 fix query 2023-06-30 12:22:37 +03:00
6b4517b5dc Fix bug 63112 2023-06-29 19:04:20 +03:00
870d4efac5 added translations 2023-06-29 18:06:36 +03:00
c0f3860ee9 Billing: affiliateId to shopping link 2023-06-29 14:16:26 +05:00
d6e3d3c3ba ASC.Data.Reassigns: ReassignProgressItem: progress change 2023-06-29 11:47:43 +03:00
dff3333862 fix query 2023-06-29 11:32:05 +03:00
c4692c0e69 fixed query 2023-06-28 20:17:22 +03:00
9845542023 fix 2023-06-28 20:10:44 +03:00
44558fad54 Merge branch 'develop' into feature/web-plugins 2023-06-28 18:13:48 +03:00
23889afe39 fix 2023-06-28 18:07:50 +03:00
4f1a68d440 ASC.Data.Reassigns: ReassignProgressItem: run ReassignStorage method 2023-06-28 16:14:30 +03:00
bce52a2549 fixed query 2023-06-28 13:52:14 +03:00
c505c8dc2b added translations 2023-06-28 13:35:40 +03:00
13d5d61cad ASC.IPSecurity: ip restriction range can't start with dash or slash 2023-06-28 10:52:21 +03:00
7e543a07bf ASC.IPSecurity: optimization 2023-06-28 10:48:56 +03:00
879d190234 ASC.IPSecurity: fix for check CIDR restrictions with IPv6 addresses 2023-06-28 10:44:08 +03:00
cba8f62d8f ASC.IPSecurity: fixed mapping after rename "tenant" to "tenantid" 4a1e1a88e7 2023-06-28 10:40:33 +03:00
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.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.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2023-06-27 18:29:23 +03:00
c0a1608691 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-27 16:43:58 +03:00
3ba27cd577 added translations 2023-06-27 16:42:20 +03:00
254771a43a Core: Security: fixed validation 2023-06-27 14:17:46 +03:00
116d4c8174
Merge pull request #1491 from ONLYOFFICE/bugfix/fix-migration-namespaces
Bugfix/fix migration namespaces
2023-06-27 02:37:30 -07:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
54ba3c7d9f Merge branch 'develop' into feature/web-plugins 2023-06-27 10:52:10 +03:00
265335d371 fix 2023-06-26 11:33:37 +03:00
01bbf1fb5e rename migration.core to migrations.core 2023-06-26 11:12:57 +03:00
7c7e20dfa3 fix migration namespace 2023-06-25 02:15:36 +03:00
0f571bf31b added translations 2023-06-23 18:11:24 +03:00
706394ee7f fix 63006 2023-06-22 18:19:15 +03:00
30233cd8c4 added translations 2023-06-22 18:09:30 +03:00
1bcdcd4f46 migrations for standalone 2023-06-21 21:11:18 +03:00
09ffbbba7e create migration context 2023-06-21 15:40:55 +03:00
28055fc876 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-21 10:54:57 +03:00
Timofey Boyko
9ad33a34f9 WebPlugins: fix upload 2023-06-20 17:46:41 +03:00
fc311ef24f fix 62906, 62999 2023-06-20 17:12:10 +03:00
Timofey Boyko
34ec335aa2 WebPlugins: fix start 2023-06-20 14:41:05 +03:00
67eac48247 fix migration 2023-06-19 16:31:56 +03:00
221c28b532 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-19 14:39:05 +03:00
3d694ad5ae Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Webhooks.Core/EF/Model/WebhooksLog.cs
#	web/ASC.Web.Studio/GlobalUsings.cs
#	web/ASC.Web.Studio/Startup.cs
2023-06-19 11:46:35 +03:00
f79d996709 fixed fatal error from logs 2023-06-16 15:07:39 +03:00
b5b865236b added translations 2023-06-16 13:54:38 +03:00
9d425e0f8f nlog: CustomExceptionFilterAttribute change LogError => LogCritical 2023-06-15 19:03:00 +03:00
a1235de616 nlog: DebugRemoteIpAddress => TraceRemoteIpAddress 2023-06-15 18:49:45 +03:00
10a63e5908 telegram: removed deprecated dll 2023-06-15 16:57:16 +03:00
d03e4ef330 nlog: fixed LoggerMiddleware 2023-06-15 16:56:11 +03:00
a5ee8e3824 nlog: update dll 2023-06-15 16:55:43 +03:00
84444d89a1 added UnhandledExceptionMiddleware 2023-06-15 16:54:15 +03:00
f12e821ba4 nlog: log fatal error 2023-06-15 16:53:43 +03:00
e3681c243f ASC.Common: replace deprecated .dll 2023-06-14 15:56:11 +03:00
3f191d928a added logger 2023-06-14 15:03:07 +03:00
6e07ad70f4 refactoring 2023-06-14 11:47:11 +03:00
0198f88c64 EF: added substring db function, refactoring 2023-06-14 11:45:40 +03:00
a3bcd0a099 fixed 62906 2023-06-13 00:39:02 +03:00
6491f137e5 fixed 61957 2023-06-13 00:08:10 +03:00
baa18cab8b fixed 62955 2023-06-12 23:54:10 +03:00
083cf7e049
Merge pull request #1465 from ONLYOFFICE/feature/cdn-for-dynamic-content
s3: added support presigned cdn url for Media/Image viewer
2023-06-10 09:41:51 +03:00
680d75b213 s3: added support presigned cdn url for Media/Image viewer 2023-06-10 09:33:59 +03:00
b55b91f5e9 added translations 2023-06-09 19:10:09 +03:00
1905566b90 refactoring 2023-06-09 14:28:49 +03:00
ba345c0f06 fix merge 2023-06-09 14:04:55 +03:00
5cdb23bc5d added translations 2023-06-09 10:56:28 +03:00
fef76e032f added translations 2023-06-08 18:24:46 +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
7ba5cc975b Webhooks: fixed migrations 2023-06-07 21:23:38 +03:00
65d2343c65 added translations 2023-06-07 17:40:23 +03:00
a1c4dffd33 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-07 10:27:38 +03:00
812a570e51 Firebase: added config for mobile application 2023-06-07 10:27:26 +03:00
6888fdbd51 added translations 2023-06-06 18:47:15 +03:00
75a83f3253 Now setting "CanIndexByContent" is always true 2023-06-06 18:27:40 +03:00
f9b979c89c Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-06 14:27:00 +03:00
d62949de40 Firebase: added FirebaseDbContext to pool 2023-06-06 14:26:30 +03:00
71d0dce908 fix Bug 62879 2023-06-06 11:49:37 +03:00
f4f5edec05 Merge branch 'develop' into feature/webhooks-page
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
2023-06-06 01:49:14 +03:00
6a4ebb9854 Files: exclude thumbnails from quota 2023-06-02 17:08:15 +03:00
80deac02c5 Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
ec65b8b6b8 fix 2023-06-01 23:21:22 +03:00
6dd4adc79d Files: HttpRequestExtensions: added Request-Token header 2023-06-01 18:13:27 +03:00
9b456a71ae fix 2023-06-01 15:59:17 +03:00
746962bc06 Merge branch 'develop' into features/security-elasticsearch 2023-06-01 15:45:31 +03:00
1f9ec5087b fix 2023-06-01 14:30:20 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
15ea9521c1 refactoring 2023-06-01 14:01:21 +03:00
c44e162162 fix ClearEventsService 2023-06-01 13:58:52 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
eaa733b7fa CompileAsyncQuery: TelegramDao 2023-05-31 18:03:36 +03:00
869519758a CompileAsyncQuery: TariffService 2023-05-31 17:07:09 +03:00
Vladimir Khvan
7619fe03e8 Merge branch 'develop' into feature/webhooks-page 2023-05-31 16:05:47 +05:00
6d01b26ca5 redis: bugfixed 2023-05-31 13:13:26 +03:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
ea23868aea fix 2023-05-31 11:28:33 +03:00
cac224c022 fix 2023-05-31 11:19:00 +03:00
743a8a363c ApiSystem: removed region support 2023-05-31 11:01:17 +03:00
9a3f0278a3 CompileAsyncQuery: RegisterInstanceDao 2023-05-31 10:55:03 +03:00
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
dbbebc8c4b CompileAsyncQuery: ProviderAccountDao 2023-05-30 22:23:11 +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
78c9a7713a CompileAsyncQuery: PortalControllerHelper 2023-05-30 16:21:52 +03:00
e557a73b36 CompileAsyncQuery NotifyCleanerService 2023-05-30 16:17:05 +03:00
98fb5838b9 CompileAsyncQuery: MobileAppInstallRegistrator 2023-05-30 15:56:07 +03:00
720fff1455 CompileAsyncQuery: IPRestrictionsRepository 2023-05-30 15:50:17 +03:00
645afb959f CompileAsyncQuery: InvitationLinkHelper 2023-05-30 15:42:15 +03:00
d7100426de CompileAsyncQuery: IntegrationEventLogService 2023-05-30 15:39:28 +03:00
b99f5e24f3 CompileAsyncQuery: FirebaseDao 2023-05-30 14:15:20 +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
c0547f5887 DistributedTaskQueue: fixed removing orphan tasks 2023-05-30 13:16:12 +03:00
7724669c7e fix ef Find 2023-05-30 12:36:46 +03:00
01c3b6e2a1 fixed accepting overdue licence 2023-05-30 11:38:38 +03:00
e5359fad09 fix 2023-05-30 11:26:25 +03:00
9eeec5cc10 CompileAsyncQuery: FeedReadedDataProvider 2023-05-30 11:06:18 +03:00
3d7ef0ef5a CompileAsyncQuery: FeedAggregateDataProvider 2023-05-29 23:26:14 +03:00
5120181799
Merge pull request #1446 from ONLYOFFICE/feature/standalone
Feature/standalone
2023-05-29 18:28:34 +04:00
92d92905c4 CompileAsyncQuery:DbWorker 2023-05-29 16:58:15 +03:00
20320a8fb1 CompileAsyncQuery:DbWorker 2023-05-29 15:01:13 +03:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
f364696ae2 CompileAsyncQuery: DbUserService 2023-05-29 12:48:09 +03:00
845aaa085f Quota: cache by region 2023-05-27 19:44:29 +03:00
5c2fb03209 fix 2023-05-26 18:44:27 +03:00
9dc458e64d CompileAsyncQuery: DbTenantService 2023-05-26 17:41:44 +03:00
8360f77177 Merge branch 'feature/optimization-ef' into feature/optimization-queries 2023-05-26 15:09:33 +03:00
dc6b076ea8 fix 2023-05-26 14:06:44 +03:00
8d088c30ce remove internal methods 2023-05-26 13:45:41 +03:00
d1b384da2c Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-26 12:45:13 +04:00
ce2bc4cb54 CompileAsyncQuery: DbSettingsManager 2023-05-26 11:24:58 +03:00
18d04bf45a fix 2023-05-25 18:24:26 +03:00
2a1c97bf2a CompileAsyncQuery: DbSettingsManager 2023-05-25 17:53:05 +03:00
b217384437 CompileAsyncQuery: DbRadicale 2023-05-25 17:36:01 +03:00
659eb22801 CompileAsyncQuery: DbQuotaService 2023-05-25 17:06:24 +03:00
fa17019f70 CompileAsyncQuery: DbLoginEventsManager 2023-05-25 16:29:51 +03:00
71de2c94e7 CompileAsyncQuery: DbHelper 2023-05-25 16:09:43 +03:00
23171528ef CompileAsyncQuery: DbAzService 2023-05-25 15:58:21 +03:00
f39b300a2e CompileAsyncQuery: BaseIndexer 2023-05-25 12:51:55 +03:00
d42eb8e4d2 CompileAsyncQuery: BackupRepository 2023-05-25 12:28:31 +03:00
f0c320f3b0 CompileAsyncQuery: BackupPortalTask 2023-05-25 11:25:58 +03:00
bf8bd3a0ef CompileAsyncQuery: AuditEventsRepository 2023-05-25 11:19:03 +03:00
2a15974880 CompileAsyncQuery: AccountLinker 2023-05-25 10:58:09 +03:00
ef7795f2df Backup: fixed payment after restore 2023-05-24 19:33:10 +03:00
48b580f1b0 added translations 2023-05-24 18:25:14 +03:00
4e0c388d8b Core: added support of empty payment configuration 2023-05-24 18:10:17 +03:00
76db809e3b fix 2023-05-24 17:39:00 +03:00
d78a777a9d fix 2023-05-24 17:16:41 +03:00
7fb137ace1 valueTask instend of Task Internal 2023-05-24 12:40:59 +03:00
f34cab4bf3 remove wait 2023-05-24 10:15:16 +03:00
94388c0616 Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-23 17:00:12 +03:00
395faf8121 fixed Bug 62708 2023-05-23 15:02:01 +03:00
NikitaVashchuk
d1eeb6263c removed uri size limit for webhook config 2023-05-22 16:10:15 +05:00
2f96868672 fix 2023-05-21 18:59:22 +03:00
d7cee576a0 fix async 2023-05-21 00:48:08 +03:00
fab1e08cc5 fix GetOldEventsAsync 2023-05-21 00:34:05 +03:00
e1bbd9a389 fix GetOldEventsAsync 2023-05-21 00:28:04 +03:00
76e80de7be fix ElasticSearchService- ReIndex 2023-05-21 00:23:44 +03:00
fd3f479f7f IResourceFilter to IAsyncResourceFilter 2023-05-21 00:09:11 +03:00
8f1e35b818 added translations 2023-05-19 17:23:00 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
5cc7d38737 fix 2023-05-18 19:26:23 +03:00
819c6597f4 added translations 2023-05-18 18:23:26 +03:00
b3f93d713b Payments: fixed for standalone 2023-05-18 12:02:48 +03:00
986361b4a0 People: new filter AccountLoginType 2023-05-17 11:20:27 +03:00
9b5d90ff6f fix merge 2023-05-17 11:01:43 +03:00
5cbdfdef9b Merge branch 'develop' into feature/optimization-ef 2023-05-17 11:01:32 +03:00
f5cb9d9e21 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
#	common/services/ASC.AuditTrail/AuditReportResource.de.resx
#	common/services/ASC.AuditTrail/AuditReportResource.tr.resx
#	common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
2023-05-16 21:53:23 +03:00
24081d3fdd added translations 2023-05-16 18:43:39 +03:00
bb70294faa Quota: update is a Standalone feature 2023-05-16 17:33:25 +03:00
5521b925e8 Webhooks: added total for Webhooks journal 2023-05-16 12:22:53 +03:00
0d54ec005a Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-16 13:11:19 +04:00
63b0370a07 Webhooks: fixed query 2023-05-16 11:51:02 +03:00
dc805b8cbd Fix UselessModuleTranslationKeysTest issue (key: FreeStartupPlan) 2023-05-16 12:46:49 +04:00
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
fd45e59e51 transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6) 2023-05-15 20:49:23 +03:00
0338a029e8 Payments: fixed price for eu 2023-05-15 19:30:14 +03:00
47a8b890da added translations 2023-05-15 17:52:57 +03:00
36eb80dadb Payment: fixed 2023-05-15 14:28:13 +03:00
4dc8faeea9 fixed RegionHelper 2023-05-13 21:37:04 +03:00
c65685b9ef fix 2023-05-12 22:53:18 +03:00
7ca54ad440 fix translate tests 2023-05-12 22:49:19 +03:00
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
163853751d fix 2023-05-12 20:47:41 +03:00
3bb1ca7969 Billing: fixed upload license 2023-05-12 18:58:53 +03:00
2586edcef3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-12 18:18:45 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
5a92a23467 remove crm resource 2023-05-12 17:36:47 +03:00
986545dc63 fix translate tests 2023-05-12 17:13:49 +03:00
c456074d28 SocketIO: FilesHub: fixed for anonymous user 2023-05-12 14:58:23 +03:00
3232c28744 SocketIO: Auth: added auth by share key 2023-05-12 14:57:00 +03:00
cff0bed424 Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks 2023-05-12 14:56:36 +03:00
bbfdd149a0 Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-12 12:22:02 +03:00
aca3cf4e3b fixed tests 2023-05-12 12:20:37 +03:00
0c5fa3ca49 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-11 19:12:33 +03:00
4f10368a78 added translations 2023-05-11 19:12:10 +03:00
9386b2ae09 Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-11 16:20:33 +03:00
15b5aaaf83 Revert "removed products"
This reverts commit fee81e8a3b.
2023-05-11 11:26:28 +03:00
4817ccbfb3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-10 18:43:17 +03:00
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
aa33f00c23 socket.io: fixed routes 2023-05-10 14:16:27 +03:00
18acde413b Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-10 13:57:30 +03:00
437e2d4aa5 fix smtp delete 2023-05-10 13:23:38 +03:00
605e4376ce Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-10 13:23:15 +03:00
a0bbc7d40f Core: RegionHelper: added null check 2023-05-10 13:22:57 +03:00
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
74ca3e7705 Api: removed support for xml and format filter 2023-05-10 11:29:22 +03:00
8f9e698b88 RegisterInstanceWorkerService: optimization 2023-05-10 10:58:33 +03:00
fee81e8a3b removed products 2023-05-10 10:57:06 +03:00
322fb1aba3 fixed slow stopping service 2023-05-10 10:51:26 +03:00
3076d3d45d Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:40:16 +03:00
3e451e54b6 fix 2023-05-08 17:37:53 +03:00
976c288d32 Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:30:29 +03:00
bede99f758 fixed price for current quota 2023-05-07 22:35:39 +03:00
950e867013 GeolocationHelper: fix 2023-05-06 22:08:40 +03:00
571932a4e0 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-06 21:39:54 +03:00
136d1a8715 fix 2023-05-06 21:39:34 +03:00
ca27ccb590 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-06 20:22:40 +03:00
1aa1a3db94 dbip: refactoring 2023-05-06 20:22:36 +03:00
64c176855c Webhooks: optimization 2023-05-06 19:55:12 +03:00
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
44c6178ebd Bug 62403 - Settings:Restore. backup tenants_tariffrow 2023-05-06 00:02:00 +03:00
NikitaVashchuk
ea31657287 fix bug 61992 2023-05-05 21:44:35 +05:00
13a156bea9 added translations 2023-05-05 18:57:21 +03:00
006b58e405 LicenceReader: fixed int parsing 2023-05-05 10:57:53 +03:00
633ed22763 fixed rabbitmq connection leak 2023-05-04 23:11:20 +03:00
fa1bfb8acd Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-04 19:21:08 +03:00
738ae4e38d added translations 2023-05-04 19:20:39 +03:00
01f4b889a4
Merge pull request #1402 from ONLYOFFICE/bugfix/fix-client-proto
Bugfix/fix client proto
2023-05-04 18:04:13 +03:00
32053e0c05
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
Bugfix/aws
2023-05-04 17:10:17 +03:00
4322eff660 fix smtp 2023-05-04 16:32:59 +03:00
e3594e3c54 Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-03 23:32:11 +03:00
d265fb4373 add Backend.Translations.Tests 2023-05-03 23:31:45 +03:00
c61c938729 removed x-rewriter-url 2023-05-03 20:25:50 +03:00
2742771897 added translations 2023-05-03 16:06:12 +03:00
NikitaVashchuk
78c75d355d image only via attachment 2023-05-03 16:58:54 +05:00
7c9bbed307 Storage: fixed secure key check 2023-05-02 16:35:07 +03:00
7bed1e829c edited Chinese 2023-05-02 15:14:05 +03:00
NikitaVashchuk
5fcbee4662 added attachments for AWSSender 2023-05-02 14:02:16 +05:00
2fb3c9f975 added translations 2023-04-28 16:24:46 +03:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
a097e5659e Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-04-27 19:44:00 +03:00
aaec6da704 Storage: S3Storage: added secure key header skip 2023-04-27 19:30:26 +03:00
514d6970d3 Storage: StorageHandler: added secure key check 2023-04-27 19:29:09 +03:00
5d86663cb5 Storage: SecureHelper: added creating/parsing secret key 2023-04-27 19:28:33 +03:00
8687b3ae99 edited translations 2023-04-27 17:42:34 +03:00
5c0027f344 Storage: Constants: added secure key header 2023-04-27 17:40:15 +03:00
94ef7b3610 CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture 2023-04-27 13:15:42 +03:00
8b80702e07 fix Bug 62261 2023-04-26 19:04:34 +03:00
9071c95d4d generate documentation 2023-04-26 18:34:39 +03:00
07521657ad Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions 2023-04-26 18:03:19 +03:00
ded955da05 fixed quotes 2023-04-26 18:02:22 +03:00
82c38be053 update migration 2023-04-26 15:23:55 +03:00
1f92c079e5 ExcludeFromMigrations 2023-04-26 15:23:46 +03:00
f55f05a1ac Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-descriptions 2023-04-26 15:08:20 +03:00
b11696f70f fixes 2023-04-26 12:27:45 +03:00
d76a2c1552 remove tenant 2023-04-26 11:25:15 +03:00
8dba4f6290 generate documentation (963bcb67f1) 2023-04-26 11:08:10 +03:00
21212db8f9 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 2023-04-26 10:49:02 +03:00
1b315920f2 MessagingSystem: MessageAction: added new actions, refactoring 2023-04-25 19:56:34 +03:00
5386e9b2de AuditTrail: DocumentsActionMapper: renamed links actions 2023-04-25 19:31:14 +03:00
df43e14678 Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions 2023-04-25 19:24:45 +03:00
aa708c8877 added more descriptions and data types 2023-04-25 19:23:54 +03:00
ca9662e45b fix 2023-04-25 13:19:48 +03:00
e32880d4c5 fix 2023-04-25 12:57:32 +03:00
7e67ff2087 fix 2023-04-25 12:32:59 +03:00
7ccd0ed5e6 ignore when migration repeated models 2023-04-25 12:27:07 +03:00
Vladimir Khvan
d9418d7fef Merge branch 'develop' into feature/webhooks-page 2023-04-25 12:26:46 +05:00
a389b0bca3 fix 2023-04-25 00:29:46 +03:00
146fc43d8a add "AddDbTenant" and foreignkeys 2023-04-25 00:27:54 +03:00
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
NikitaVashchuk
c1d97f1462 changed ICacheNotify to IEventBus 2023-04-24 15:52:56 +05:00
84328fc0f3 Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137 2023-04-24 12:54:44 +03:00
f5d3372af2 Merge branch 'release/v1.0.0' into develop 2023-04-24 11:33:58 +04:00
a0adeba2e4 fix audit report 2023-04-22 15:54:34 +03:00
NikitaVashchuk
242e147563 returned images via url for notifications 2023-04-22 00:17:20 +05:00
9f9806a013 fixed greenbutton text 2023-04-21 18:45:09 +03:00
5df60b3a8b backend: using RemoteIpAddress method for get a client ip 2023-04-20 19:38:09 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
0123128b50 setup ForwardedHeadersOptions via config 2023-04-20 18:15:48 +03:00
6a660938de fix Bug 60605 2023-04-20 17:05:21 +03:00
NikitaVashchuk
f64450b6d9 fix bug 62197 2023-04-20 19:02:35 +05:00
48f9073302 Merge branch 'release/v1.0.0' into develop 2023-04-20 12:31:46 +04:00
2819a82c86 Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions 2023-04-20 12:11:10 +05:00
a388bb678d generate documentation 2023-04-19 17:26:51 +05:00
e2dfd71921 SSO: Fix error 500 (response: 14) 2023-04-19 16:11:42 +04:00
f1a6b53f74 SSO: re-written logger and it's usage 2023-04-19 16:10:38 +04:00
29c37cbba5 fix namespaces for documentation 2023-04-19 16:39:50 +05:00
b0e4677897 SSO: FIX decodeData call 2023-04-19 13:58:41 +04:00
0aec0c4dcb SSO: Extended logging 2023-04-19 12:46:14 +04:00
963bcb67f1 generate documentation 2023-04-19 13:39:32 +05:00
6c1a8d122f Fix documentation 2023-04-18 19:46:22 +05:00
4af951856f Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
# Conflicts:
#	products/ASC.People/Server/Api/PhotoController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/ApiModels/RequestDto/LinkAccountRequestDto.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-04-18 18:08:59 +05:00
NikitaVashchuk
d2758f5659 BaseCommonLinkUtility: fix ServerRootPath 2023-04-18 17:31:12 +05:00
eded2ac313 fix Bug 62137 2023-04-18 14:17:51 +03:00
Vladimir Khvan
64f5f60de2 Merge branch 'develop' into feature/webhooks-page 2023-04-18 15:20:43 +05:00
NikitaVashchuk
828d4ca35c fix groupStatus 2023-04-18 14:58:18 +05:00
aafc6ae03e fix Bug 62113 2023-04-17 23:10:10 +03:00
239a117cdf fixed bug 62100. created redis key with Invariant Culture 2023-04-17 16:48:45 +03:00
diana-vahomskaya
23c7b0d2ac fix comments 2023-04-17 16:38:00 +03:00
100bddeb4a Merge branch 'release/v1.0.0' into develop 2023-04-17 11:38:48 +04:00
Vladimir Khvan
a1e5e3b7ed Merge branch 'develop' into feature/webhooks-page 2023-04-16 15:24:17 +05:00
568e777783 update migration 2023-04-14 23:33:50 +03:00
cb5df1ad89 add UrlShortenerDbContext in db pool 2023-04-14 23:32:16 +03:00
97c82bf732 rename UrlShortenerFakeDbContext 2023-04-14 23:16:18 +03:00
NikitaVashchuk
26c566e7d2 fix CreateWebhook, added query parameters for UpdateWebhook 2023-04-14 21:31:36 +05:00
2633233cf2 UserManager: fix cache 2023-04-14 18:42:23 +03:00
f56b589749 some more fixes 2023-04-14 18:19:43 +03:00
c0bcc09493 migrate and fix urlShortener
random generate short link
2023-04-14 17:41:15 +03:00
3e2e60e7b0 Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
496085fa48 fix Bug 62023 2023-04-14 15:49:41 +03:00
acbbc78533 Translations: Tests: Added SpellCheck Common excludes 2023-04-14 13:29:31 +04:00