mushka
|
a226566a62
|
fix close button design
|
2022-04-04 15:19:59 +03:00 |
|
mushka
|
fa49b3120b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-04 12:25:22 +03:00 |
|
|
a3bdebfe90
|
Merge pull request #495 from ONLYOFFICE/hotfix/campaigns-banner
Hotfix/campaigns banner
|
2022-04-01 18:13:14 +03:00 |
|
mushka
|
562bd9d088
|
changed thumbnail border
|
2022-04-01 17:42:45 +03:00 |
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|
Timofey Boyko
|
d30c565ca4
|
Web:Components:Themes: change padding for context-menu-button of row view
|
2022-04-01 12:40:51 +03:00 |
|
mushka
|
40cb0fd01f
|
Merge branch 'feature/info-panel' of github.com:ONLYOFFICE/AppServer into feature/info-panel
|
2022-04-01 12:18:29 +03:00 |
|
mushka
|
6a3e94a0d5
|
added group support for access component & temporary removed Location system property
|
2022-04-01 12:16:40 +03:00 |
|
mushka
|
e4ab022fb9
|
dark theme redesign
|
2022-03-30 21:59:00 +03:00 |
|
|
a8837a900b
|
Web: Components: Themes: fix arrow color
|
2022-03-30 21:36:28 +03:00 |
|
|
57b3e60ac5
|
Web: Components: Submenu: add theme
|
2022-03-30 21:14:53 +03:00 |
|
Timofey Boyko
|
e5f3d27eb9
|
Web:Common:Section: add support dark-theme for section-header with scroll
|
2022-03-30 11:17:43 +03:00 |
|
|
f41c65623b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# config/kafka.json
|
2022-03-30 11:14:47 +03:00 |
|
mushka
|
463a1f54a9
|
fix kafka conflict
|
2022-03-29 14:32:50 +03:00 |
|
mushka
|
4e4ecec78f
|
added dark theme support & moved context options "view details" button
|
2022-03-29 13:59:56 +03:00 |
|
|
f05dadf17c
|
Web: Components: Avatar: substitute default image
|
2022-03-29 11:20:57 +03:00 |
|
|
969e5382f1
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-28 18:46:56 +03:00 |
|
|
5831f29ec9
|
Web: Components: Themes: fix toggle content icon color
|
2022-03-28 18:46:38 +03:00 |
|
Timofey Boyko
|
822abd7a08
|
Web:Components:Themes: fix border image source width for table container header and fix section width
|
2022-03-28 18:15:29 +03:00 |
|
|
1a8ee8c78b
|
Web: Components: Themes: fix slider margin
|
2022-03-26 15:20:43 +03:00 |
|
|
35114d973d
|
Web: Components: Themes: add colors for downloadAppList
|
2022-03-26 13:58:50 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
|
33ae3ba6c5
|
Web: Components: Themes: add personal logo color
|
2022-03-22 17:59:45 +03:00 |
|
|
a2ad2b450f
|
Web: Components: CampaignsBanner: fix style
|
2022-03-22 17:43:28 +03:00 |
|
|
a0f0f8bffc
|
Web: Components: Themes: fix arrow color
|
2022-03-22 12:30:21 +03:00 |
|
|
b76d091e9d
|
Web: Components: Themes: fix floatingButton theme
|
2022-03-21 18:33:45 +03:00 |
|
Timofey Boyko
|
8355fa388d
|
Web:Common: remove old filter component, update import and change themes
|
2022-03-21 13:56:42 +03:00 |
|
|
836a2180ba
|
Web: Components: Fixed styles.
|
2022-03-18 12:11:43 +03:00 |
|
|
9efaef5d45
|
Web: Components: fix tooltip shadow
|
2022-03-17 11:12:15 +03:00 |
|
|
b07aeae206
|
Web: Components: fix tooltip padding
|
2022-03-17 10:47:24 +03:00 |
|
|
c001de8f74
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-16 13:03:29 +03:00 |
|
|
9056b14453
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-16 12:11:48 +03:00 |
|
|
5bebc14b58
|
Web: Components: fix social buttons theme
|
2022-03-16 11:44:03 +03:00 |
|
|
c30ba25631
|
Web:Components:Changed the margin of the fieldContainer for dark theme.
|
2022-03-16 11:22:10 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
mushka
|
ddd973c024
|
fixed dark theme supportion
|
2022-03-14 19:03:23 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
mushka
|
5e8d4cd4f1
|
added dark theme support
|
2022-03-14 18:45:02 +03:00 |
|
|
e62c1a5f59
|
Web:Components:Added white arrowColor for dark theme.
|
2022-03-10 18:27:14 +03:00 |
|
Timofey Boyko
|
e273391c00
|
Web:Files:Section: add theme support for desktop sort button in tile view
|
2022-03-05 18:51:00 +03:00 |
|
Timofey Boyko
|
d85ae13b7a
|
Web:Files: fix table view in dark-theme
|
2022-03-05 17:47:56 +03:00 |
|
Timofey
|
19937f50dd
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-01 22:05:41 +08:00 |
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
Timofey
|
337497c5d5
|
Web:Common: add circle indicator if filter is active
|
2022-02-24 16:36:59 +08:00 |
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
Timofey
|
aa91c011d8
|
Web:Common: refactoring new filter input and add support group selector
|
2022-02-22 17:10:13 +08:00 |
|
Timofey
|
1a386a8adf
|
Web:Common:Components: add support dark-theme for new filter input
|
2022-02-21 19:55:06 +08:00 |
|
Timofey
|
767f17b92c
|
Web:Components:DropDown: add border at dark-theme
|
2022-02-09 15:36:18 +08:00 |
|