|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a1f63b88ea
|
SSO: fixed redirect to login on error
|
2023-04-26 14:39:49 +03:00 |
|
|
|
09b5f612c9
|
added translations
|
2023-04-26 12:23:34 +03:00 |
|
|
|
d76a2c1552
|
remove tenant
|
2023-04-26 11:25:15 +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 |
|
|
|
f35671c7dc
|
SSO: fixed a re-login
|
2023-04-19 17:55:09 +03: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 |
|
|
|
3639f97217
|
fixed warnings
|
2023-04-18 16:49:42 +03: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 |
|
NikitaVashchuk
|
26c566e7d2
|
fix CreateWebhook, added query parameters for UpdateWebhook
|
2023-04-14 21:31:36 +05:00 |
|
NikitaVashchuk
|
476cbb6f2b
|
fix bug 62015
|
2023-04-14 20:03:33 +05: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 |
|
|
|
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 |
|
