|
|
80deac02c5
|
Merge branch 'develop' into feature/public-room-backend
|
2023-06-02 16:42:16 +03:00 |
|
|
|
28b569724b
|
Merge pull request #1361 from ONLYOFFICE/feature/image-thumbnail
Feature/image thumbnail
|
2023-06-02 13:25:25 +04:00 |
|
|
|
2dae5a3a4a
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-06-02 13:16:21 +04:00 |
|
|
|
81a2e2d7e9
|
Merge pull request #1452 from ONLYOFFICE/feature/storybook-update
Feature/storybook update
|
2023-06-02 12:19:21 +04:00 |
|
|
|
d076b53a4c
|
Update yarn.lock
|
2023-06-02 12:14:57 +04:00 |
|
|
|
f8ba50e462
|
Merge branch 'develop' into feature/storybook-update
|
2023-06-02 11:41:42 +04:00 |
|
|
|
f451bc51be
|
Files: refactoring
|
2023-06-01 18:14:40 +03:00 |
|
|
|
2fe9912b06
|
Files: ExternalShare: added getting key from header
|
2023-06-01 18:14:28 +03:00 |
|
|
|
6dd4adc79d
|
Files: HttpRequestExtensions: added Request-Token header
|
2023-06-01 18:13:27 +03:00 |
|
|
|
63e67924f2
|
Merge pull request #1412 from ONLYOFFICE/feature/history-timeout
Feature/history timeout
|
2023-06-01 18:39:22 +04:00 |
|
|
|
f616399501
|
Merge pull request #1356 from ONLYOFFICE/features/security-elasticsearch
add Authentication and ApiKey for elasticsearch
|
2023-06-01 06:52:51 -07:00 |
|
|
|
746962bc06
|
Merge branch 'develop' into features/security-elasticsearch
|
2023-06-01 15:45:31 +03:00 |
|
|
|
a700bd0950
|
Merge pull request #1350 from ONLYOFFICE/feature/optimization-ef
Feature/optimization ef
|
2023-06-01 05:19:00 -07:00 |
|
Timofey Boyko
|
197e732e5f
|
Web:Client: fix close media
|
2023-06-01 15:16:03 +03:00 |
|
Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
|
|
bc8a9ca637
|
Merge branch 'develop' into feature/history-timeout
|
2023-06-01 15:56:03 +04:00 |
|
|
|
73ad86c06c
|
Merge pull request #1351 from ONLYOFFICE/feature/redirect-after-access-denied
Feature/redirect after access denied
|
2023-06-01 15:51:46 +04:00 |
|
|
|
8bba856ec4
|
Merge branch 'develop' into feature/redirect-after-access-denied
# Conflicts:
# packages/client/src/pages/Home/index.js
# packages/client/src/routes/client.js
|
2023-06-01 14:41:43 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
Mushka Nikita
|
faba786447
|
added room name text ellipsis
|
2023-06-01 14:25:10 +03:00 |
|
Mushka Nikita
|
931b7619ae
|
added folder label text ellipsis
|
2023-06-01 14:21:00 +03:00 |
|
|
|
acea91ef92
|
fix
|
2023-06-01 14:11:43 +03:00 |
|
DmitrySychugov
|
e055271043
|
Web: Components: real tags name change
|
2023-06-01 13:51:59 +05:00 |
|
DmitrySychugov
|
2bc2b7a30e
|
Web: Components: manually changing name
|
2023-06-01 13:50:13 +05:00 |
|
DmitrySychugov
|
46e8cd3741
|
Web: Components: fixed console log warnings
|
2023-06-01 13:22:12 +05:00 |
|
DmitrySychugov
|
d33f8655ee
|
Web: Components: added wrapper for catalog item story
|
2023-06-01 13:21:37 +05:00 |
|
DmitrySychugov
|
d5c4ce7d5d
|
Web: Components: removed unnecessary prop
|
2023-06-01 13:20:34 +05:00 |
|
DmitrySychugov
|
82af41943b
|
Web: Components: fixed console warnings
|
2023-05-31 20:01:38 +05:00 |
|
DmitrySychugov
|
4037e62d61
|
Web: Components: fixed storybook blocks import
|
2023-05-31 20:00:04 +05:00 |
|
DmitrySychugov
|
100d5ef173
|
Web: fixed tags folder name for storybook
|
2023-05-31 18:31:52 +05:00 |
|
DmitrySychugov
|
1105568509
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-31 18:20:37 +05:00 |
|
DmitrySychugov
|
f75f1c8d3e
|
Web: Components: fixed people tree menu console log
|
2023-05-31 18:19:16 +05:00 |
|
DmitrySychugov
|
947c6be6e3
|
Web: Components: fixed main button and tree menu theme
|
2023-05-31 14:43:42 +05:00 |
|
DmitrySychugov
|
5e338731f6
|
Web: Components: fixed main button theme in story
|
2023-05-31 14:29:45 +05:00 |
|
DmitrySychugov
|
5cd2dee957
|
Web: Components: fixed mobile main button docs
|
2023-05-31 13:55:27 +05:00 |
|
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +03:00 |
|
|
|
ed99c87ff8
|
Merge pull request #1449 from ONLYOFFICE/feature/filling-status-line
feature/filling-status-line
|
2023-05-30 19:59:44 +04:00 |
|
|
|
054b3a648c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 19:48:17 +04:00 |
|
DmitrySychugov
|
3fccdff213
|
Web: Components: added dark mode switcher for storybook docs
|
2023-05-30 20:13:14 +05:00 |
|
|
|
443bd12881
|
Nginx: Fix bad favicon on login and editor
|
2023-05-30 18:56:29 +04:00 |
|
DmitrySychugov
|
ae70d0b274
|
Web: Components: fixed tooltip docs
|
2023-05-30 17:11:09 +05:00 |
|
DmitrySychugov
|
fe6f9e07eb
|
Web: Components: Tag: added description
|
2023-05-30 17:08:31 +05:00 |
|
DmitrySychugov
|
d4c4cd0ae4
|
Web: Components: fixed onClickOutside error
|
2023-05-30 17:07:22 +05:00 |
|
DmitrySychugov
|
2dbaf3a2fa
|
Web: Components: PasswordInput: fixed storybook docs
|
2023-05-30 17:01:05 +05:00 |
|
DmitrySychugov
|
341e344f0c
|
Web: Components: AccessRightSelect: delete icons for story
|
2023-05-30 16:57:50 +05:00 |
|
DmitrySychugov
|
3fa4a22a79
|
Web: Components: fixed Tags description
|
2023-05-30 16:57:09 +05:00 |
|
DmitrySychugov
|
f393945385
|
Web: Components: fixed before initialization errors
|
2023-05-30 16:49:53 +05:00 |
|
|
|
4549abad2f
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 15:18:14 +04: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 |
|
|
|
94305a009c
|
Merge pull request #1448 from ONLYOFFICE/bugfix/fix-warning-currentColorScheme
bugfix/fix-warning-currentColorScheme
|
2023-05-30 13:43:11 +04:00 |
|
