|
|
578c3dab3a
|
Web:Common:Delete showRootFolderNavigation.
|
2023-06-01 18:46:37 +03:00 |
|
|
|
0f100615c1
|
Merge branch 'develop' into feature/navigation
|
2023-06-01 18:35:37 +03:00 |
|
|
|
bfd6432c0f
|
Web:Fix styles navigation.
|
2023-06-01 18:34:19 +03:00 |
|
|
|
3c55ace6fe
|
Web:Common:Add isMobileOnly check.
|
2023-06-01 18:33:37 +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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
443bd12881
|
Nginx: Fix bad favicon on login and editor
|
2023-05-30 18:56:29 +04: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 |
|
|
|
44d21119b1
|
Web:Client:Fix warning currentColorScheme.
|
2023-05-30 12:40:38 +03:00 |
|
|
|
4214470b2c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 13:16:26 +04:00 |
|
|
|
55da841b74
|
Merge branch 'develop' into feature/navigation
|
2023-05-30 12:30:02 +04:00 |
|
Mushka Nikita
|
5e201b4414
|
Merge branch 'develop' into feature/history-timeout
|
2023-05-30 11:29:48 +03:00 |
|
|
|
e5359fad09
|
fix
|
2023-05-30 11:26:25 +03:00 |
|
Mushka Nikita
|
98039c2da3
|
fixed after-rebase bugs
|
2023-05-30 11:23:54 +03:00 |
|
|
|
bbaffad97a
|
Merge pull request #1430 from ONLYOFFICE/feature/trash-filter-by-room
Feature/trash filter by room
|
2023-05-30 12:03:28 +04:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
20a4343e7c
|
Merge pull request #1444 from ONLYOFFICE/bugfix/fix-floating-button
bugfix/fix-floating-button
|
2023-05-30 11:52:35 +04:00 |
|
|
|
818700b469
|
Merge pull request #1445 from ONLYOFFICE/bugfix/filter
bugfix/filter
|
2023-05-30 11:49:31 +04:00 |
|
|
|
eafba31391
|
Web:Common:Expanded Navigation to show the root folder.
|
2023-05-30 08:48:27 +03:00 |
|
|
|
73e707a3f6
|
Web: Added check for filter instead of "instanceof".
|
2023-05-29 17:14:50 +03:00 |
|
|
|
1df9df59d6
|
Web:Common:Add showTwoProgress props.
|
2023-05-29 16:32:58 +03:00 |
|
|
|
a22dbea67f
|
Web: Client: Filter: Restored SSO filter after merge master
|
2023-05-29 14:49:08 +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 |
|
|
|
4058e2bd20
|
Merge pull request #1441 from ONLYOFFICE/hotfix/v1.0.1
Hotfix/v1.0.1
|
2023-05-29 11:47:29 +03:00 |
|
|
|
161857e2aa
|
Create README.md for OneClickInstall
|
2023-05-29 11:23:41 +05:00 |
|
|
|
845aaa085f
|
Quota: cache by region
|
2023-05-27 19:44:29 +03:00 |
|
|
|
2e76723f1f
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-26 18:58:33 +04:00 |
|
|
|
80a8a983aa
|
Fix undefined selectedItemTag
|
2023-05-26 18:58:11 +04:00 |
|
|
|
9599a68e2b
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-26 18:39:55 +04:00 |
|
|
|
c0f1eff14c
|
Update yarn.lock
|
2023-05-26 18:39:19 +04:00 |
|
|
|
65b375f759
|
Merge pull request #1438 from ONLYOFFICE/bugfix/fix-color-theme-import-cycle
Bugfix/fix color theme import cycle
|
2023-05-26 18:35:42 +04:00 |
|
|
|
ef784d23aa
|
Upload OneСlickInstall scripts on S3 (#1439)
|
2023-05-26 19:00:38 +05:00 |
|
Vlada Gazizova
|
e4d5442f76
|
Merge branch 'develop' into bugfix/fix-color-theme-import-cycle
|
2023-05-26 16:44:12 +03:00 |
|
|
|
d0eae2dac2
|
Web:Components:Add currentColorScheme in readme.
|
2023-05-26 16:42:32 +03:00 |
|
|
|
c5b2a6ed47
|
Web:Fix name.
|
2023-05-26 16:40:38 +03:00 |
|
|
|
d37f9f7d16
|
Web:Added an example of a color theme for the story.
|
2023-05-26 16:38:41 +03:00 |
|
|
|
d902e631a9
|
fix
|
2023-05-26 16:25:21 +03:00 |
|
