Commit Graph

10441 Commits

Author SHA1 Message Date
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
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
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
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
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
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
NikitaVashchuk
9340e0432f fixed invite notification format 2023-04-10 16:23:09 +05: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
6780c7da49 translations 2023-04-06 21:32:15 +03: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