Commit Graph

10864 Commits

Author SHA1 Message Date
4d0c17d396
Merge pull request #1507 from ONLYOFFICE/feature/tenantcookie
Feature/tenantcookie
2023-07-05 06:53:01 +04:00
a6954a3764 added translations 2023-07-04 18:07:50 +03:00
fcf354663b ASC.Web.Api: added CookieSettingsEnabled property to SettingsDto 2023-07-04 15:12:48 +03:00
23ebc88350
Merge pull request #1508 from ONLYOFFICE/feature/session-auth-cookies
Feature/session auth cookies
2023-07-04 14:41:26 +03:00
157605bc0b ASC.Web.Api: Authentication: Setting cookies based on the session parameter 2023-07-04 14:21:19 +03:00
506544ea7c Merge branch 'release/v1.1.0' into feature/tenantcookie 2023-07-04 13:12:09 +04: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
4305f16845 Build: Renamed profiles 2023-07-03 12:49:16 +04:00
c97c1784f5 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-03 11:30:39 +03:00
6921f945bc Build: Refactoring publish with profiles 2023-07-03 12:28:03 +04:00
ed13a667b3 Publish: Added publish profiles for ASC.Web.Api (fix error NETSDK1152) 2023-07-03 00:55:01 +04:00
2c540aed25 Publish: Added publish profiles for Unix 2023-07-03 00:53:29 +04:00
9b36fe282b Server: Added publish profiles for "ASC.People", "ASC.Web.Studio" 2023-07-02 14:54:56 +03: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
641164ecc2 added translations 2023-06-30 18:24:35 +03:00
4fc3820719 fix Bug 63164 2023-06-30 16:39:36 +03:00
654f59fb9d fix bug 63175 2023-06-29 18:48:39 +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
c505c8dc2b added translations 2023-06-28 13:35:40 +03:00
091f943497 fixed query 2023-06-28 12:50:39 +03:00
37402968cb Api: unauthorized user can send password change instruction or invitation message without ip security checking 2023-06-28 10:57:42 +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
3ba27cd577 added translations 2023-06-27 16:42:20 +03:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
cb2d0c3a61 Payments: fixed account url 2023-06-26 17:03:47 +03:00
443453d538 save csp header to distributed cache 2023-06-26 13:38:49 +03:00
0f571bf31b added translations 2023-06-23 18:11:24 +03:00
706394ee7f fix 63006 2023-06-22 18:19:15 +03:00
53d2e4f779 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-22 18:09:54 +03:00
30233cd8c4 added translations 2023-06-22 18:09:30 +03:00
2108a7854f fix (f1c8a649f2) 2023-06-22 12:13:46 +03:00
f1c8a649f2 fix Bug 62204 2023-06-21 16:25:06 +03:00
3d6eea02a9 added PaymentAccountHandler 2023-06-20 12:24:47 +03:00
932afe9106 fix 2023-06-19 16:34:23 +03:00
beb2debb44 fix 2023-06-19 16:15:39 +03:00
e8071dbcc8 fix context 2023-06-19 14:05:17 +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
09d7b6b48c added translations 2023-06-16 16:36:52 +03:00
b5b865236b added translations 2023-06-16 13:54:38 +03:00
Viktor Fomin
2f119d6982 Web: API: fix 2023-06-14 10:46:44 +03:00
baa18cab8b fixed 62955 2023-06-12 23:54:10 +03:00
b55b91f5e9 added translations 2023-06-09 19:10:09 +03:00
ca3f29cd5d Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-08 18:25:15 +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
21ff40ff20 Notify: fixed null reference exception 2023-06-08 14:30:32 +03:00
65d2343c65 added translations 2023-06-07 17:40:23 +03:00
6888fdbd51 added translations 2023-06-06 18:47:15 +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
140ee73a5a Settings: added check 2023-06-02 18:39:50 +03:00
80deac02c5 Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
Viktor Fomin
aff8d417d1 Merge branch 'release/v1.1.0' into feature/crash-report 2023-06-02 13:27:24 +03:00
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
f4983243f9 added samesite option 2023-06-01 19:02:21 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
acea91ef92 fix 2023-06-01 14:11:43 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
Viktor Fomin
47921a0fcb Web: API: return firebase database url 2023-06-01 13:11:55 +03:00
Viktor Fomin
e68a67ad68 Revert "Web: API: return firebase database url"
This reverts commit 17a23f1b51.
2023-06-01 13:09:17 +03:00
Viktor Fomin
17a23f1b51 Web: API: return firebase database url 2023-05-31 16:32:20 +03:00
d3f95ac9bf CompileAsyncQuery: StatisticManager 2023-05-31 16:25:18 +03:00
Vladimir Khvan
7619fe03e8 Merge branch 'develop' into feature/webhooks-page 2023-05-31 16:05:47 +05:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
dbbebc8c4b CompileAsyncQuery: ProviderAccountDao 2023-05-30 22:23:11 +03:00
98fb5838b9 CompileAsyncQuery: MobileAppInstallRegistrator 2023-05-30 15:56:07 +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
daef20f563 Wizard: login to the portal after completing the wizard 2023-05-30 11:58:17 +03:00
01c3b6e2a1 fixed accepting overdue licence 2023-05-30 11:38:38 +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
ff122af0cc Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-27 09:13:06 +03:00
37a3f5648e Consumers: fixed instruction 2023-05-26 14:57:52 +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
0efb8d58e7 Accept license if exists 2023-05-24 18:49:10 +03:00
48b580f1b0 added translations 2023-05-24 18:25:14 +03:00
6b62074721 Revert "Quota: fixed quota check"
This reverts commit a307be32ba.
2023-05-24 18:11:12 +03:00
76db809e3b fix 2023-05-24 17:39:00 +03:00
719bfad535 Settings: added socket url for anonymous user 2023-05-24 14:10:03 +03:00
NikitaVashchuk
294ba3ffa8 sending Saas lettters for startup plan 2023-05-24 15:50:54 +05:00
7fb137ace1 valueTask instend of Task Internal 2023-05-24 12:40:59 +03:00
NikitaVashchuk
cf1955b5fa fix retryWebhook 2023-05-24 13:19:47 +05:00
NikitaVashchuk
55bfd77df0 retring for successfull webhooks 2023-05-24 13:15:08 +05:00
f34cab4bf3 remove wait 2023-05-24 10:15:16 +03:00
a307be32ba Quota: fixed quota check 2023-05-23 17:58:04 +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
347bcfc2e5 fix 2023-05-22 20:46:23 +03:00
3727c65845 fix 2023-05-22 19:38:25 +03:00
8f1e35b818 added translations 2023-05-19 17:23:00 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
4e6671ea76 fix 2023-05-18 21:31:57 +03:00
819c6597f4 added translations 2023-05-18 18:23:26 +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
ba6eeb623f fix 2023-05-16 19:58:23 +03:00
b644a16e6f Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-16 18:44:02 +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
d145872b6e fixed portal request 2023-05-16 14:41:01 +03:00
1ecea2eaa8 fix bugs 62206 and 62204 2023-05-16 13:56:12 +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
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
47a8b890da added translations 2023-05-15 17:52:57 +03:00
fc23b9d04c fixed warnings 2023-05-15 13:41:37 +03:00
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
3bb1ca7969 Billing: fixed upload license 2023-05-12 18:58:53 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
4f10368a78 added translations 2023-05-11 19:12:10 +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
437e2d4aa5 fix smtp delete 2023-05-10 13:23:38 +03:00
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
fc5672ebb3
Merge pull request #1409 from ONLYOFFICE/bugfix/62456
fix bug 62456
2023-05-08 17:24:59 +03:00
bede99f758 fixed price for current quota 2023-05-07 22:35:39 +03:00
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
NikitaVashchuk
4888973e73 fix bug 62456 2023-05-05 22:09:17 +05:00
13a156bea9 added translations 2023-05-05 18:57:21 +03:00
0751f62c75 fixed tenantExtra method 2023-05-05 12:11:21 +03:00
678d1d4c03 smtp: status 2023-05-05 12:05:31 +03:00
c93374d10a fix smtp 2023-05-05 11:53:01 +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
95eea07d41
Merge pull request #1401 from ONLYOFFICE/bugfix/daily-feed
fix 4000, 4006 actions(create, update docspace user)
2023-05-04 18:31:18 +03:00
fad4cc1dbe add isdefaultSettings 2023-05-04 17:55:23 +03:00
NikitaVashchuk
b613e66cb7 Merge branch 'hotfix/v1.0.1' into bugfix/62369
# Conflicts:
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx
2023-05-04 19:24:15 +05:00
32053e0c05
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
Bugfix/aws
2023-05-04 17:10:17 +03:00
0f0128e4d0
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
Bugfix/notifications
2023-05-04 17:02:55 +03:00
NikitaVashchuk
dc20e2cb2d fix settings naming 2023-05-04 18:57:57 +05:00
NikitaVashchuk
9745e65d07 fix settings naming 2023-05-04 18:55:14 +05:00
4322eff660 fix smtp 2023-05-04 16:32:59 +03:00
a69bcf1cfc SendJoinInviteMail didn't throw exceptions 2023-05-03 20:45:17 +03:00
fa77fc1dbf added translations 2023-05-03 18:15:10 +03:00
1acb252c87 added translations 2023-05-03 17:42:43 +03:00
NikitaVashchuk
1c301b572a fix 4000, 4006 actions(create, update docspace user) 2023-05-03 19:09:17 +05:00
686b37f1a2 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-03 16:06:40 +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
5d55683496 tariff method now accepts "refresh" argument 2023-05-03 13:44:19 +03:00
f20eb2429c edited Note in pattern_portal_rename 2023-05-03 12:01:40 +03:00
NikitaVashchuk
aa963d61b9 fix bug 62369 2023-05-03 08:53:46 +05:00
e3dfc1cd0a edited pattern_portal_rename 2023-05-02 16:22:38 +03:00
7bed1e829c edited Chinese 2023-05-02 15:14:05 +03:00
6a9bef4707 Files: Security: added message for brut force exception 2023-04-28 16:24:58 +03: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
8687b3ae99 edited translations 2023-04-27 17:42:34 +03:00
94ef7b3610 CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture 2023-04-27 13:15:42 +03:00
8864f289e6 fix Bug 62246 2023-04-26 20:30:23 +03:00
NikitaVashchuk
30f001a4c0 fix periodic and welcome notifications 2023-04-26 20:47:06 +05:00
6d13c4bc32 added translations 2023-04-26 18:20:27 +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
f55f05a1ac Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-descriptions 2023-04-26 15:08:20 +03:00
a1f63b88ea SSO: fixed redirect to login on error 2023-04-26 14:39:49 +03:00
b11696f70f fixes 2023-04-26 12:27:45 +03:00
09b5f612c9 added translations 2023-04-26 12:23:34 +03:00
d76a2c1552 remove tenant 2023-04-26 11:25:15 +03:00
21212db8f9 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 2023-04-26 10:49:02 +03:00
6445ccb0ac Core: CookiesManager: added new cookie types, added item id support 2023-04-25 19:28:34 +03:00
4e8404c574 Web: BrutForce: added increment/decrement 2023-04-25 19:25:25 +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
Vladimir Khvan
d9418d7fef Merge branch 'develop' into feature/webhooks-page 2023-04-25 12:26:46 +05:00
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
cf05348934
Merge pull request #1382 from ONLYOFFICE/bugfix/bug-62137
Bugfix/bug 62137
2023-04-24 16:29:34 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
6574df323c fix Bug 62255 2023-04-24 06:21:35 -07:00
NikitaVashchuk
c1d97f1462 changed ICacheNotify to IEventBus 2023-04-24 15:52:56 +05:00
00f96b5090 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-04-24 13:47:22 +03:00
d46661eb85 edited translations 2023-04-24 13:46:53 +03: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
NikitaVashchuk
9712466c98 png images for notifications 2023-04-22 16:21:35 +05:00
d25e10bf2c added translations 2023-04-21 23:34:13 +03:00
NikitaVashchuk
242e147563 returned images via url for notifications 2023-04-22 00:17:20 +05:00
d34663eb9f fixed quota description 2023-04-21 21:03:40 +03:00
9f9806a013 fixed greenbutton text 2023-04-21 18:45:09 +03:00
d1d2d2f87c fixed admin activation message 2023-04-21 18:04:04 +03:00
69e5f40bc8 added translations 2023-04-21 17:21:38 +03:00
f0a6679ba8 added translations 2023-04-21 15:19:59 +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
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
f35671c7dc SSO: fixed a re-login 2023-04-19 17:55:09 +03:00
29c37cbba5 fix namespaces for documentation 2023-04-19 16:39:50 +05:00
86e5725ec4 api: model to inDto param name 2023-04-19 13:31:12 +05:00
NikitaVashchuk
22fc47ecb1 do not send mail with confirmation email when registering by email link 2023-04-19 13:08:09 +05:00
NikitaVashchuk
a6bb9aac83 WhitelabelController: GetWhiteLabelLogos: removed notification field from response 2023-04-19 13:03:01 +05:00
6c1a8d122f Fix documentation 2023-04-18 19:46:22 +05:00