Commit Graph

287 Commits

Author SHA1 Message Date
309a60899e
Merge pull request #1447 from ONLYOFFICE/feature/navigation
feature/navigation
2023-06-06 11:54:23 +04:00
585f5cb239 Web:Rename rootFolderTitle to rootFolderTitleColor. Added truncation of the long folder name in the room. 2023-06-02 13:30:27 +03:00
bfd6432c0f Web:Fix styles navigation. 2023-06-01 18:34:19 +03:00
DmitrySychugov
d33f8655ee Web: Components: added wrapper for catalog item story 2023-06-01 13:21:37 +05:00
DmitrySychugov
1105568509 Merge branch 'develop' into feature/storybook-update 2023-05-31 18:20:37 +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
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
Elyor Djalilov
8394dcd826 Client: PortalSettings: Security: fix display remove ip icon 2023-05-12 15:53:47 +05:00
Viktor Fomin
6f20d5a4da Fix Bug 62250: Unreadable text when archive is selected from the Backup List 2023-04-26 23:59:47 +03:00
48f9073302 Merge branch 'release/v1.0.0' into develop 2023-04-20 12:31:46 +04:00
Viktor Fomin
d1956bc0ef Fix Bug 62136: applied social buttons disabled style 2023-04-18 21:07:31 +03:00
Elyor Djalilov
86a7048a14 Web: PortalSettings: Backup. fix styles 2023-04-17 15:07:09 +05:00
18bf4167f7 Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00
8f1cead793 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-04-12 11:08:22 +03:00
87b3cecbfa Web:Components:Fixed missing dark theme shadow on sort list on mobile. 2023-04-12 11:06:09 +03:00
Viktor Fomin
127ba1e43f Components: Themes: fix dark theme for social button 2023-04-11 14:15:46 +03:00
4704d4f107 Web:Components:Add theme buttons. 2023-04-11 12:06:27 +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
5826727231 Web:Components:Added theme for profile info lines on mobile. 2023-04-10 12:41:39 +03:00
Viktor Fomin
d369dbf285 Components: Themes: add missed 2023-04-06 21:45:25 +03:00
5744f7e67c Web: Added team training alert. 2023-04-03 15:42:51 +03:00
Akmal Isomadinov
cd7a7c87a3 Refactoring theme color 2023-03-27 21:14:30 +05:00
Akmal Isomadinov
bb10eeb9a5 Web:Components:Drop-Down-Item Fixed the drop-down list of the selected color 2023-03-27 17:33:07 +05:00
32e60d2d07 Merge branch 'develop' into feature/webhooks-ui 2023-03-16 13:56:02 +04:00
30bb3a6e3b Web: PortalUnavailable: Fixed theme styles. 2023-03-15 13:08:34 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
2023-03-10 17:06:55 +03:00
Viktor Fomin
f2d8c90b21 Components: Themes: add colors 2023-03-10 16:19:32 +03:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
913b931544 Merge branch 'develop' into feature/webhooks-ui 2023-03-06 11:21:00 +04:00
Timofey Boyko
6fcabb5e2b Web:Client:Profile: fix styles for main-profile 2023-03-02 15:56:27 +03:00
Vladimir Khvan
7b59eb56a1 disabled color was added / previous disabled color renamed into past color 2023-03-01 14:40:03 +05:00
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03:00
7fcdf899cf Web: Notifications: Changed styles to match layouts. 2023-02-22 15:07:34 +03:00
1ef55e5fd8 Merge branch 'develop' into feature/webhooks-ui 2023-02-21 12:42:43 +04:00
Viktor Fomin
214cb0a89c Components: Themes: fix color 2023-02-21 11:13:45 +03:00
aa32773e61 Merge branch 'develop' into feature/webhooks-ui 2023-02-16 14:36:38 +03:00
Vladimir Khvan
d9bd0b7cf7 colors for copy icon were added 2023-02-14 16:02:00 +05:00
Mushka Nikita
629effb5d2 added trash erasure warning 2023-02-14 03:23:06 +03:00
Vladimir Khvan
399158b768 color theme for numeration was added 2023-02-13 16:55:56 +05:00
Vladimir Khvan
c86238b344 Merge branch 'feature/webhooks-ui' of github.com:ONLYOFFICE/DocSpace into feature/webhooks-ui 2023-02-10 16:11:30 +05:00
Vladimir Khvan
b4cc536f71 unnecessary props were deleted 2023-02-10 16:05:34 +05:00
415f0755c8 Merge branch 'develop' into feature/webhooks-ui 2023-02-10 11:29:54 +03:00
Viktor Fomin
358f9ea1d3 Merge branch 'develop' into bugifx/wizard 2023-02-08 12:48:55 +03:00
ca2906ebee Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
17a6d8785f Web: Correcting the absence of the background of the button when isChecked in the storybook. 2023-02-08 10:34:02 +03:00
d8c1bf08f9 Web: Added room check for notifications disabled. 2023-02-07 13:34:52 +03:00
Vladimir Khvan
3a73008145 calendar dark theme was changed 2023-02-07 14:22:47 +05:00
Vladimir Khvan
a8d8596fc9 calendar base theme was changed 2023-02-07 14:22:30 +05:00
Viktor Fomin
075374c43a Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-06 13:52:41 +03:00