|
3f27bb6ce5
|
Merge branch 'develop' into feature/public-room-backend
|
2023-07-12 14:37:37 +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 |
|
|
173e9473a6
|
Settings: added apiDocsLink
|
2023-07-07 11:53:23 +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 |
|
|
89a609dd5e
|
Merge branch 'develop' into feature/ipsecurity-fixes
|
2023-07-03 13:22:25 +03:00 |
|
|
0ff6e98473
|
TenantCookieSettings: lifetime is now 1440 by default. added "default" property
|
2023-06-30 19:07:18 +03:00 |
|
|
654f59fb9d
|
fix bug 63175
|
2023-06-29 18:48:39 +03:00 |
|
|
c0f3860ee9
|
Billing: affiliateId to shopping link
|
2023-06-29 14:16:26 +05: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 |
|
|
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 |
|
|
2108a7854f
|
fix (f1c8a649f2 )
|
2023-06-22 12:13:46 +03:00 |
|
|
f1c8a649f2
|
fix Bug 62204
|
2023-06-21 16:25:06 +03:00 |
|
|
932afe9106
|
fix
|
2023-06-19 16:34:23 +03:00 |
|
|
beb2debb44
|
fix
|
2023-06-19 16:15:39 +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 |
|
Viktor Fomin
|
2f119d6982
|
Web: API: fix
|
2023-06-14 10:46:44 +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 |
|
|
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 |
|
|
f5620a3666
|
Merge branch 'develop' into feature/optimization-queries
|
2023-06-01 23:52:40 +03:00 |
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
acea91ef92
|
fix
|
2023-06-01 14:11:43 +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 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +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 |
|
|
01c3b6e2a1
|
fixed accepting overdue licence
|
2023-05-30 11:38:38 +03:00 |
|
|
8d088c30ce
|
remove internal methods
|
2023-05-26 13:45:41 +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
|
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 |
|
|
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 |
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +03:00 |
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
ba6eeb623f
|
fix
|
2023-05-16 19:58:23 +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 |
|
|
3bb1ca7969
|
Billing: fixed upload license
|
2023-05-12 18:58:53 +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 |
|
|
9c9df73b96
|
backend: dbip_location rename to dbip_lookup. refactoring.
|
2023-05-06 14:48:36 +03:00 |
|
|
0751f62c75
|
fixed tenantExtra method
|
2023-05-05 12:11:21 +03:00 |
|
|
c93374d10a
|
fix smtp
|
2023-05-05 11:53:01 +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 |
|
|
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 |
|
|
5d55683496
|
tariff method now accepts "refresh" argument
|
2023-05-03 13:44:19 +03:00 |
|
NikitaVashchuk
|
aa963d61b9
|
fix bug 62369
|
2023-05-03 08:53:46 +05:00 |
|
|
39c1824162
|
Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611 .
|
2023-04-27 22:35:00 +03:00 |
|
|
94ef7b3610
|
CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture
|
2023-04-27 13:15:42 +03:00 |
|
|
b11696f70f
|
fixes
|
2023-04-26 12:27:45 +03:00 |
|
|
d76a2c1552
|
remove tenant
|
2023-04-26 11:25:15 +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 |
|
|
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 |
|
|
2819a82c86
|
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
|
2023-04-20 12:11:10 +05: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
|
a6bb9aac83
|
WhitelabelController: GetWhiteLabelLogos: removed notification field from response
|
2023-04-19 13:03:01 +05:00 |
|
|
18b5f9f697
|
fix documentation
|
2023-04-18 19:27:48 +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 |
|
Vladimir Khvan
|
64f5f60de2
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-18 15:20:43 +05:00 |
|
Vladimir Khvan
|
a1e5e3b7ed
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-16 15:24:17 +05:00 |
|
NikitaVashchuk
|
26c566e7d2
|
fix CreateWebhook, added query parameters for UpdateWebhook
|
2023-04-14 21:31:36 +05: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 |
|
|
41483c51be
|
add base-domain in api method "settings"
|
2023-04-14 10:49:00 +03:00 |
|
|
24e3a3ec30
|
Merge branch 'feature/api-descriptions' of https://github.com/ONLYOFFICE/DocSpace into feature/api-descriptions
|
2023-04-13 12:44:33 +03:00 |
|
|
50c3f5805a
|
fixes for api docs
|
2023-04-13 12:43:54 +03:00 |
|
NikitaVashchuk
|
61533655d5
|
added log filter by eventId
|
2023-04-12 16:35:15 +05:00 |
|
|
ed96fe2bdb
|
refresh quota
|
2023-04-11 18:58:44 +03:00 |
|
|
4dad1d6067
|
Merge branch 'develop' into feature/optimization-ef
|
2023-04-10 23:19:56 +03:00 |
|
|
2a736e7c64
|
Settings: legalterms
|
2023-04-10 19:10:30 +03:00 |
|
|
6ed8cebb5f
|
fix
|
2023-04-10 11:41:12 +03:00 |
|
|
64c44bed2a
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-07 16:14:11 +04:00 |
|
|
7b1101b50c
|
add "documentation-email" in config
|
2023-04-07 14:18:22 +03:00 |
|
NikitaVashchuk
|
3fc877a422
|
GetJournal(HttpGet("webhooks/log"): added group status for webhooks as bit flag; added deliveryFrom, deliveryTo; added search by configId;
GetTenantWebhooks(HttpGet("webhook")): added status for last webhook;
UpdateWebhook([HttpPut("webhook")]): added ssl option;
Updated db migrations
|
2023-04-06 23:46:23 +05:00 |
|
|
b1e7c1d0e6
|
fix merge
|
2023-04-06 17:24:14 +03:00 |
|
|
07d847fdd1
|
Merge branch 'develop' into feature/optimization-ef
|
2023-04-06 17:24:05 +03:00 |
|
|
a1cb32ce36
|
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
|
2023-04-05 20:07:30 +05:00 |
|
|
8d6e51a16f
|
fix
|
2023-04-05 12:54:02 +03:00 |
|
|
e35e8f1369
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-05 11:20:45 +04:00 |
|
|
32f5d3dc2f
|
fix
|
2023-04-04 14:35:22 +03:00 |
|
|
3e2de4cb75
|
add ZendeskKey and BookTrainingEmail in SettingsDto
|
2023-04-04 13:20:59 +03:00 |
|