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 |
|
|
|
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 |
|
DmitrySychugov
|
69bcf4b71a
|
Web: Components: fixed floating button story
|
2023-05-29 19:51:24 +05:00 |
|
DmitrySychugov
|
c2e14919f3
|
Web: Components: fixed dark theme color
|
2023-05-29 19:48:38 +05:00 |
|
DmitrySychugov
|
5db16b0be3
|
Web: Components: fixed storybook console log error
|
2023-05-29 19:48:11 +05:00 |
|
DmitrySychugov
|
3264ec78e1
|
Web: Components: fixed combobox docs
|
2023-05-29 19:47:13 +05:00 |
|
DmitrySychugov
|
d2388a72c1
|
Web: Components: enable mdx format for storybook, rename mdx files
|
2023-05-29 19:46:28 +05: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 |
|
DmitrySychugov
|
68b5c2c964
|
Web: Components: fixed prop warnings
|
2023-05-29 14:43:23 +05:00 |
|
|
|
4058e2bd20
|
Merge pull request #1441 from ONLYOFFICE/hotfix/v1.0.1
Hotfix/v1.0.1
|
2023-05-29 11:47:29 +03:00 |
|
Timofey Boyko
|
e64f541d22
|
Web:Client: update fetch rooms
|
2023-05-29 11:04:59 +03:00 |
|
Timofey Boyko
|
5c461123fb
|
Web:Client: update fetch people
|
2023-05-29 10:25:19 +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 |
|
Timofey Boyko
|
eefd26216a
|
Web:Client: modify navigation system at empty containers and home filter
|
2023-05-26 19:02:36 +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 |
|
DmitrySychugov
|
bf93681c3f
|
Web: Components: update yarn lock
|
2023-05-26 19:58:09 +05:00 |
|
DmitrySychugov
|
1c257bc3bc
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-26 19:46:23 +05: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 |
|
|
|
8e5b341dc3
|
web: fix margin in third-party modal
|
2023-05-26 16:59:38 +04:00 |
|
|
|
cb32b5617b
|
Merge pull request #1432 from ONLYOFFICE/feature/type-badge
Feature/type badge
|
2023-05-26 15:47:16 +03:00 |
|
Subhonbek
|
f996a162ac
|
fix badge
|
2023-05-26 15:42:30 +03:00 |
|
|
|
cb623476ce
|
Consumers: removed SmscProvider
|
2023-05-26 15:31:08 +03:00 |
|
Subhonbek
|
f33cf6015d
|
fix bg
|
2023-05-26 15:26:31 +03:00 |
|
