Commit Graph

10418 Commits

Author SHA1 Message Date
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
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
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
04f6fe5db4 api method "whitelabel/logos" AllowSuspended 2023-03-30 13:49:52 +03:00
76b68d74f8 fix: hidden _usersInRoomFeature and fix portal/payment/quota 2023-03-29 17:48:52 +03: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
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
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
Vashchuk Nikita
ca6e1d1553 returned old images 2023-03-23 02:26:07 +05:00