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
e872505280
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
2023-04-18 19:27:56 +05:00
18b5f9f697
fix documentation
2023-04-18 19:27:48 +05:00
3639f97217
fixed warnings
2023-04-18 16:49:42 +03: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
cbe2e24efe
edited lang-s indexes
2023-04-18 15:10:44 +03:00
78e6688211
added translations
2023-04-18 14:30:55 +03:00
Vladimir Khvan
64f5f60de2
Merge branch 'develop' into feature/webhooks-page
2023-04-18 15:20:43 +05:00
e6c2f39e39
fix translations
2023-04-18 09:58:41 +03:00
3b4c396391
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 18:26:09 +03:00
03acba483c
added translations
2023-04-17 18:25:51 +03:00
265a27a320
fixed notify pattern resource
2023-04-17 17:40:44 +03:00
232c6bbdf1
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 15:20:10 +03:00
95ca8e7811
added bg
2023-04-17 15:19:46 +03:00
759fe5624a
fix
2023-04-17 14:24:59 +03:00
7ba38a4a4e
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 14:18:44 +03:00
177c79fc79
added az
2023-04-17 14:18:22 +03:00
e54aafd480
Merge branch 'release/v1.0.0' into develop
2023-04-17 13:49:15 +04:00
61011b759d
fix Bug 62120
2023-04-17 12:27:56 +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
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
f56b589749
some more fixes
2023-04-14 18:19:43 +03:00
NikitaVashchuk
476cbb6f2b
fix bug 62015
2023-04-14 20:03:33 +05:00
c0bcc09493
migrate and fix urlShortener
...
random generate short link
2023-04-14 17:41:15 +03:00
496085fa48
fix Bug 62023
2023-04-14 15:49:41 +03:00
7df9ee8f8b
Merge pull request #1358 from ONLYOFFICE/bugfix/notifications
...
Bugfix/notifications
2023-04-14 15:27:09 +03:00
41483c51be
add base-domain in api method "settings"
2023-04-14 10:49:00 +03:00
5ef5fbded9
UserPhotoManager: fixed problem with cache
2023-04-13 18:53:23 +03:00
5fcd3e166b
Merge branch 'release/v1.0.0' into develop
2023-04-13 16:44:51 +04:00
2b17d2eed0
people: fixed generate thumbnails
2023-04-13 14:44:22 +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
18bf4167f7
Merge branch 'release/v1.0.0' into develop
2023-04-13 13:27:58 +04:00
4f12380445
people: update last_modified in core_user table after set user photo
2023-04-12 22:27:16 +03:00
c85caa5651
people: fixed response for POST {userid}/photo/thumbnails method
2023-04-12 19:18:40 +03:00
1458715cb2
ApiSystem: hack
2023-04-12 16:39:19 +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
42e8b739f3
fix Bug 61992
2023-04-11 17:52:39 +03:00
NikitaVashchuk
336f340cd0
fix bug 62015(expired link)
2023-04-11 17:29:35 +05:00
d88fd2c2b2
fix merge
2023-04-10 23:20:16 +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
df62b3862f
Merge branch 'release/v1.0.0' into develop
...
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
e2dc7c8381
create CustomSynchronizationContext in UserPhotoManager
2023-04-10 14:25:43 +03:00
NikitaVashchuk
9340e0432f
fixed invite notification format
2023-04-10 16:23:09 +05: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
bcb12080fa
fix async
2023-04-07 10:33:06 +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
6780c7da49
translations
2023-04-06 21:32:15 +03: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
138544c86c
remove CreateExecutionStrategy
2023-04-05 19:30:35 +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
Vladimir Khvan
1747d61f42
Merge branch 'develop' into feature/webhooks-page
2023-04-05 14:46:38 +05:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05: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
a733c29c2b
Merge branch 'develop' into refactoring/generic-classes
2023-04-04 12:33:26 +03:00
91373783c2
fix thirdparty
2023-04-04 12:10:20 +03:00
Vashchuk Nikita
91606f1962
small fix
2023-04-03 16:38:23 +05:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
5aacc82904
fixed room history
2023-03-30 18:36:22 +03:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
6309d9530c
fix async
2023-03-30 15:11:45 +03:00
04f6fe5db4
api method "whitelabel/logos" AllowSuspended
2023-03-30 13:49:52 +03:00
ff8721a4b1
Hide documentation warnings ( 4dfeea2969)
2023-03-29 20:29:53 +05:00
6fc89c8112
GenerateDocumentationFile ( 0147a44476)
2023-03-29 20:29:48 +05:00
5e5a39d5c6
Hide smtp api documentation
2023-03-29 20:02:54 +05:00
7684a3e2fc
Hude modules api documentation
2023-03-29 20:02:41 +05:00
76b68d74f8
fix: hidden _usersInRoomFeature and fix portal/payment/quota
2023-03-29 17:48:52 +03:00
a4419d3194
Fix documentation warnings
2023-03-29 19:36:14 +05:00
aa1b712131
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
2023-03-29 19:28:15 +05:00
fe91eae377
Fix documentation warnings
2023-03-29 19:25:20 +05:00
4bda4e2d79
revert 9b7c765f19
2023-03-29 15:19:32 +03:00
9b7c765f19
fix quota: ignore visible for api method payment/quota
2023-03-29 12:20:31 +03:00
a79c5420b6
fixed user deleting
2023-03-29 09:43:09 +03:00
f882861bc6
fixes
2023-03-28 18:29:50 +03:00
27c7804aba
fix methods with task and without async
2023-03-28 13:49:31 +03:00
e1b01e2d81
fix methods with task and without async
2023-03-28 13:13:13 +03:00
0bcd45f0ce
fix async
2023-03-28 10:43:46 +03:00
aac1896a0f
remove CreateDbContextAsync and fix ExecuteAsync
2023-03-28 00:25:55 +03:00
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
Vladimir Khvan
ae6fbde080
Merge branch 'feature/webhooks-page' of github.com:ONLYOFFICE/DocSpace into feature/webhooks-page
2023-03-27 14:12:38 +05:00
Vladimir Khvan
91d1826f63
Merge branch 'develop' into feature/webhooks-page
2023-03-27 14:12:15 +05:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
7504e20f63
Merge pull request #1316 from ONLYOFFICE/feature/notification-fixes
...
Feature/notification fixes
2023-03-24 14:41:20 +03:00
240d60c8b6
guest welcome letter changed (Bug 60658)
2023-03-24 14:14:17 +03:00
6bafdc2343
user welcome letter changed
2023-03-24 13:28:55 +03:00
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
...
Bugfix/notification image format
2023-03-24 12:39:32 +03:00
1324f349a1
docs tips letter changed
2023-03-24 12:36:31 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
Vashchuk Nikita
a9284faf1d
added logo.png as embedded resource
2023-03-23 21:33:33 +05:00
Vashchuk Nikita
7d7f537317
added converting from png, jpg
2023-03-23 20:18:37 +05:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
