|
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 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03: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 |
|
Timofey
|
9b307a2c17
|
Web:Components: change color for link in dark-theme
|
2022-02-08 18:18:21 +08:00 |
|
Timofey
|
11032cee42
|
Web:Files: fix hover and active fill color for shared and form button in dark theme
|
2022-02-08 18:03:40 +08:00 |
|
Timofey
|
bdb587199b
|
Web:Studio: add support dark-theme for top arrow in profile menu
|
2022-02-08 17:52:22 +08:00 |
|
Timofey
|
6b0f6b0ca4
|
Web:People: change color for pending users in dark-theme
|
2022-02-08 17:21:07 +08:00 |
|
Timofey
|
972b315f45
|
Web:Components:NewContextMenu: add support dark-theme
|
2022-02-08 00:05:55 +08:00 |
|
Timofey
|
2e72853ead
|
Web:Common:Navigation: add support dark-theme
|
2022-02-07 23:35:09 +08:00 |
|
Timofey
|
5b17663403
|
Web:Studio:Header: add theme support for catalog-burger in mobile view
|
2022-02-07 21:56:03 +08:00 |
|
Timofey
|
5c41c56773
|
Web:Components: add support dark theme for main-button-mobile
|
2022-02-07 21:28:49 +08:00 |
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
Timofey
|
1c80398617
|
Web:Common:Catalog: refactoring catalog components and add support dark-theme
|
2022-02-04 21:21:30 +08:00 |
|
Timofey
|
e30a293c5f
|
Web:Components:CatalogItem: refactoring and add support dark-theme
|
2022-02-04 18:27:16 +08:00 |
|
Timofey
|
48f9e4953c
|
Web:Client:Components: refactoring navigation-item icon component and change margin top and bottom for logo
|
2022-02-04 16:12:38 +08:00 |
|
Timofey
|
223c04a3c7
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-03 20:59:26 +08:00 |
|
Timofey
|
b101d89792
|
Web:Components:Themes: add dark theme support for catalog-item, catalog, menu-item, navigation, new context menu components
|
2022-02-03 17:49:54 +08:00 |
|
Timofey
|
8ebd6d510f
|
Web:Components:MenuItem: change height menu item as header
|
2022-02-02 23:25:55 +08:00 |
|
Timofey
|
750becafb8
|
Merge branch 'feature/new-context-menu' into feature/virtual-room-1.2
|
2022-02-01 16:07:27 +08:00 |
|
Timofey
|
bc9dd07400
|
Merge branch 'develop' into branch feature/new-context-menu
|
2022-02-01 15:07:01 +08:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
Timofey
|
b00b9c7306
|
Web:Components:Theme: change button color, backdroundColor and border
|
2022-01-28 20:22:13 +08:00 |
|
Timofey
|
47527c3430
|
Web:People:ProfileAction: add support dark-theme for link in tooltip
|
2022-01-28 19:46:46 +08:00 |
|
Timofey
|
98e4233a2d
|
Web:Studio:Settings: add support dark-theme for link in tooltip
|
2022-01-28 19:31:56 +08:00 |
|
Timofey
|
210ebd7ad1
|
Web:Files: add support dark-theme for select-file-dialog-aside_buttons class
|
2022-01-28 18:03:33 +08:00 |
|
Timofey
|
3c53e73484
|
Web:Files:SimpleFileInput: add support dark-theme
|
2022-01-28 17:57:15 +08:00 |
|
|
a8ff064b16
|
Web: Components: fix social buttons style
|
2022-01-28 11:46:45 +03:00 |
|
|
066f8d1a2d
|
Web: Components: fix social buttons style
|
2022-01-28 11:23:02 +03:00 |
|
Timofey
|
d6cc388760
|
Web:Components:Themes: change color to files quick buttons
|
2022-01-28 15:08:56 +08:00 |
|
Timofey
|
5af7f89261
|
Web:Files: fixed hover and selected color in dark theme for tree folders
|
2022-01-27 22:19:13 +08:00 |
|
Timofey
|
64d90c5d5d
|
Web:Components:PasswordInput: fixed text color for tooltip in dark theme
|
2022-01-27 21:01:39 +08:00 |
|
Timofey
|
fb1a86eecd
|
Web:Files:QuickButton: fixed color and hover after merge branch 'develop'
|
2022-01-27 18:25:54 +08:00 |
|
Timofey
|
4b45eaa243
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-27 18:10:13 +08:00 |
|
Timofey
|
def9370171
|
Web:Components:MainButtonMobile: fixed drop down styles for mobile view
|
2022-01-27 17:14:55 +08:00 |
|
Timofey
|
f955bea115
|
Web:Client:Components: fixed product name color for dark and base theme
|
2022-01-25 16:32:35 +08:00 |
|
Timofey
|
55fe7bd155
|
Web:Common:PageLayout: fixed background and fill color for section toggler in dark theme
|
2022-01-25 16:17:12 +08:00 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
Timofey
|
ab32a8ca66
|
Web:Components:Themes: fixed box-shadow value for group menu
|
2022-01-24 20:04:55 +08:00 |
|
Timofey
|
57f5caba85
|
Web:Common:ErrorContainer: add support dark-theme
|
2022-01-24 18:48:24 +08:00 |
|
Timofey
|
731a1f1394
|
Web:Components:Themes: update color for floating button progress
|
2022-01-24 18:05:54 +08:00 |
|
Timofey
|
4ef7bed60c
|
Web:Components:Table: update dark-theme for group menu
|
2022-01-24 17:56:02 +08:00 |
|
Timofey
|
9f4c980b74
|
Web:Components:Themes: update color for loading button in files upload panel
|
2022-01-24 17:03:31 +08:00 |
|
Timofey
|
a1f6875006
|
Web:Files:Dialogs: added support dark-theme for third party modal dialog
|
2022-01-24 15:57:21 +08:00 |
|
Timofey
|
f831c9344a
|
Web:People:Profile: add support dark-theme for tooltip-link in profile info
|
2022-01-21 23:04:23 +08:00 |
|
Timofey
|
d83808142a
|
Web:Common:Loaders: add support dark-theme for tile loader
|
2022-01-21 22:40:29 +08:00 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
Timofey
|
444ae18ccd
|
Web:Components:Themes: move rgb color to global colors variable
|
2022-01-21 20:07:58 +08:00 |
|
Timofey
|
4d4d9b0568
|
Web:Files: update dark theme after merge branch 'develop' into feature/dark-theme
|
2022-01-21 16:35:44 +08:00 |
|
Timofey
|
84aabef8e7
|
Web:Common: update dark theme after merge branch 'develop'
|
2022-01-20 23:45:33 +08:00 |
|
Timofey
|
4598d238e5
|
Web:Components: update dark theme after merge branch 'develop'
|
2022-01-20 23:29:09 +08:00 |
|
Timofey
|
e5f06b932d
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-20 21:18:30 +08:00 |
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
|
b78992e357
|
Web:Components:Themes: update dark-theme after merge branch 'develop' into feature/dark-theme
|
2021-12-30 00:29:53 +08:00 |
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08:00 |
|
|
ad5ee66ef9
|
Web:Wizard:Components: add support dark-theme
|
2021-12-28 23:52:12 +08:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
25ee05f38a
|
Web:Common:FilterInput: fix fill and stroke color for filter button in dark and base themes
|
2021-12-28 17:58:56 +08:00 |
|
|
ee839e8169
|
Web:Common:PageLayout: change background-color and fill for section toggler button in dark-theme
|
2021-12-28 16:52:37 +08:00 |
|
|
190e3eed1e
|
Web:People:Section: add fill for send clock icon in dark-theme
|
2021-12-28 16:43:22 +08:00 |
|
|
148acc38c9
|
Web:People:Dialogs: add support dark-theme
|
2021-12-28 15:35:41 +08:00 |
|
|
76595827fa
|
Web:People:HOCs: add support dark-theme
|
2021-12-28 15:20:56 +08:00 |
|
|
3259cf4db4
|
Web:People:PeopleSelector: add support dark-theme
|
2021-12-28 15:13:37 +08:00 |
|
|
42411acf49
|
Web:Login: add support dark-theme
|
2021-12-28 11:27:15 +08:00 |
|
|
12e392f174
|
Web:Files:VersionHistory: add support dark-theme
|
2021-12-28 10:50:01 +08:00 |
|
|
8b72068bc9
|
Web:Files:PrivateRoomPage: add support dark-theme
|
2021-12-27 19:02:04 +08:00 |
|
|
9a7c4d86ed
|
Web:Files:SharedButton: add support dark-theme
|
2021-12-27 18:52:43 +08:00 |
|
|
20e7a51029
|
Web:Files:Icons: add support dark-theme
|
2021-12-27 18:46:19 +08:00 |
|
|
e0c84b4c19
|
Web:Files:EditingWrapperComponent: add support dark-theme
|
2021-12-27 18:17:03 +08:00 |
|
|
c5f01e1d87
|
Web:Files:Badges: add support dark-theme
|
2021-12-27 17:42:53 +08:00 |
|
|
9b98a3200c
|
Web:Files:Panels: add support dark-theme
|
2021-12-27 16:41:27 +08:00 |
|
|
ded46585cf
|
Web:Files:EmptyContainer: add support dark-theme
|
2021-12-25 17:04:19 +08:00 |
|
|
4f2bade87e
|
Web:Files:DragTooltip: add support dark-theme
|
2021-12-25 01:11:13 +08:00 |
|
|
39ec4f3e36
|
Web:Files:Dialogs: add support dark-theme
|
2021-12-25 01:08:23 +08:00 |
|
|
d46679e9bb
|
Web:Common:PageLayout: add support dark-theme for section
|
2021-12-25 00:50:45 +08:00 |
|
|
b45e7a26ae
|
Web:Common:MediaViewer: add support dark-theme
|
2021-12-25 00:43:52 +08:00 |
|
|
6f6ea8eca8
|
Web:Common:FloatingButton: add support dark-theme
|
2021-12-24 19:36:24 +08:00 |
|
|
f3821d18f6
|
Web:Common:AdvancedSelector:add support dark-theme
|
2021-12-24 19:25:35 +08:00 |
|
|
5399ed8c82
|
Web:Files:Home: add support dark-theme for section
|
2021-12-24 17:12:31 +08:00 |
|
|
5b816aa5f1
|
Web:Files:Article:add support dark-theme for body
|
2021-12-22 23:40:13 +08:00 |
|
|
059836b95d
|
Web:Studio:ProfileMenu:add support dark theme
|
2021-12-22 21:36:13 +08:00 |
|
|
eb6deaa8cb
|
Web:Components:Tooltip:add support dark theme
|
2021-12-22 20:41:52 +08:00 |
|
|
bda5f4638b
|
Web:Components:Avatar: update dark theme
|
2021-12-22 20:18:24 +08:00 |
|
|
0dbf805f8b
|
Web:Components:TableContainer: add support dark-theme
|
2021-12-15 17:26:45 +08:00 |
|
|
07942f600c
|
Web:People:Section: add support dark-theme
|
2021-12-14 18:52:14 +08:00 |
|
|
5d4f706f77
|
Web:Components:SocialButton: add support dark-theme
|
2021-12-14 18:22:46 +08:00 |
|
|
5559783ee9
|
Web:Components:SelectorAddButton: add support dark-theme
|
2021-12-14 18:16:05 +08:00 |
|
|
6590ba1f94
|
Web:Components:SelectedItem: add support dark-theme
|
2021-12-14 18:11:19 +08:00 |
|
|
00865480dd
|
Web:Common:FilterInput: add support dark-theme
|
2021-12-14 17:45:09 +08:00 |
|
|
e7854ed5d8
|
Web:Common:PageLayout:Article: add support dark-theme
|
2021-12-14 16:14:36 +08:00 |
|
|
b7e80bc96e
|
Web:People:ArticleBody: add support dark-theme
|
2021-12-14 16:04:06 +08:00 |
|
|
4860584695
|
Web:Client:NavMenu: add support dark theme
|
2021-12-14 15:52:03 +08:00 |
|
|
22da46346b
|
Web:Components:TreeMenu: add support dark theme
|
2021-12-14 12:30:26 +08:00 |
|
|
c7c46dbcfc
|
Web:Components:LinkWithDropdown: add support dark-theme
|
2021-12-14 11:46:11 +08:00 |
|
|
27e14b8566
|
Web:Components:HelpButton: add support dark-theme
|
2021-12-14 11:42:14 +08:00 |
|
|
5261d053ee
|
Web:Components:Calendar: add support dark-theme
|
2021-12-13 21:25:03 +08:00 |
|
|
c00d019d6f
|
Web:Components:AvatarEditor: add support dark-theme
|
2021-12-13 21:10:27 +08:00 |
|
|
6104bee675
|
Web:Components:Avatar: add support dark-theme
|
2021-12-13 18:01:05 +08:00 |
|
|
cdc6e55292
|
Web:Components:ModalDialog: add support dark-theme
|
2021-12-13 16:01:14 +08:00 |
|
|
e784e9f327
|
Web:Components:TabsContainer: add support dark-theme
|
2021-12-13 15:56:27 +08:00 |
|
|
acd628633f
|
Web:Components:GroupButtonsMenu: add support dark-theme
|
2021-12-13 15:50:24 +08:00 |
|
|
a6301a7818
|
Web:Components:GroupButton: add support dark-theme
|
2021-12-13 15:45:45 +08:00 |
|
|
dec8399ab2
|
Web:Components:ViewSelector: add support dark-theme
|
2021-12-13 15:34:16 +08:00 |
|
|
13f05563fa
|
Web:Components:TextArea: add support dark-theme
|
2021-12-13 15:17:37 +08:00 |
|
|
1c1e8958da
|
Web:Components:ComboBox: add support dark-theme for selected item icon
|
2021-12-13 15:03:32 +08:00 |
|
|
f8f98eca62
|
Web:Components:Badge: add support dark-theme
|
2021-12-13 15:00:12 +08:00 |
|
|
f4984d3537
|
Web:Components:ComboBox: add support dark-theme
|
2021-12-13 14:47:27 +08:00 |
|
|
5dbdc21ffc
|
Web:Components:PasswordInput: add support dark-theme
|
2021-12-12 21:37:16 +08:00 |
|
|
0b329775d9
|
Web:Components:InputBlock: add support dark-theme
|
2021-12-12 21:17:41 +08:00 |
|
|
97cb36b31d
|
Web:Components:SearchInput: add support dark-theme
|
2021-12-12 21:06:54 +08:00 |
|
|
7e175ccdf0
|
Web:Components:TextInput: add support dark-theme
|
2021-12-12 20:32:32 +08:00 |
|
|
7f2b567af2
|
Web:Components:Button: add support dark-theme
|
2021-12-12 19:41:50 +08:00 |
|
|
a6cd56a6b5
|
Web:Components:Checkbox: add support dark-theme
|
2021-12-10 23:45:15 +08:00 |
|
|
2b39b822e6
|
Web:Components:ToggleButton: add support dark-theme
|
2021-12-10 22:47:10 +08:00 |
|
|
e7bbc913e5
|
Web:Components:RadioButton: add support dark-theme
|
2021-12-10 20:30:25 +08:00 |
|
|
c8c550ee9c
|
Web:Components:Toast: add support dark-theme
|
2021-12-10 20:10:55 +08:00 |
|
|
ebf321524a
|
Web:Components:Backdrop: add dark theme support
|
2021-12-10 19:31:43 +08:00 |
|
|
8ba8bae6b9
|
Web:Components:Heading: add dark theme support
|
2021-12-10 19:25:40 +08:00 |
|
|
a4d14fdd08
|
Web:Components:Dropdown: add dark theme support
|
2021-12-10 19:14:40 +08:00 |
|
|
38212e81bc
|
Web:Components:MainButton: add dark theme support
|
2021-12-10 19:12:02 +08:00 |
|
|
d7a18600b8
|
Web:Component:Themes: update dark theme
|
2021-12-10 19:03:42 +08:00 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05:00 |
|
|
4dac8e9ce6
|
Web: Components: changed expander-down.react.svg, fixed styles
|
2021-11-29 13:11:01 +03:00 |
|
|
99c71148d8
|
Web: Files: fixed SharingPanel styles
|
2021-11-29 12:58:21 +03:00 |
|
|
af95e8aacc
|
Web: Components: added border-radius to modal-dialog
|
2021-11-26 17:37:27 +03:00 |
|
|
4f7f76b07e
|
Web: Files: Fixed styles of modal and aside dialogues.
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
|
2021-11-19 16:09:13 +03:00 |
|
|
3f532f6765
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-02 13:36:34 +05:00 |
|
|
b42a30acda
|
Web: Components: added main button styles
|
2021-11-02 13:31:18 +05:00 |
|
|
5deac850b2
|
Web:Components:NewContextMenu: add to all views
|
2021-11-01 16:10:07 +08:00 |
|
|
20dcdde09b
|
Web:Components:MenuItem: create menu item component
|
2021-10-26 21:31:42 +08:00 |
|
|
8ba2f0c694
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2021-10-25 11:02:42 +03:00 |
|
|
94cbac3c02
|
Merge branch 'develop' into feature/catalog
|
2021-10-22 15:43:23 +08:00 |
|
|
724a90be75
|
Web: Components: fixed combo-button styles
|
2021-10-21 17:54:16 +03:00 |
|
|
d6da7a7fb2
|
Merge pull request #411 from ONLYOFFICE/bugfix/scrollbar
Bugfix/scrollbar
|
2021-10-21 16:15:24 +03:00 |
|
|
9aa3fd7047
|
Web:Common:Catalog: update branch
|
2021-10-20 22:31:39 +08:00 |
|
|
121a640bed
|
Web: Components: add hover effect for scrollbar
|
2021-10-20 13:10:45 +03:00 |
|
|
f895cde813
|
Web: Components: fix avatar edit button position
|
2021-10-20 12:09:01 +03:00 |
|
|
a75a49dc9a
|
Web: Components: delete useless
|
2021-10-20 11:10:51 +03:00 |
|
|
cad7c309ce
|
Web: Components: add avatar edit button
|
2021-10-20 00:41:42 +03:00 |
|
|
51c91cf63b
|
Web: Common: fixed user selector when aside panel expanded, corrected z-index
|
2021-10-18 17:17:36 +05:00 |
|
|
95e30d7df6
|
Web: Common: switched filter item to without portal mode, fixed opening user selector
|
2021-10-18 16:19:05 +05:00 |
|
|
6e4e3d69aa
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-12 20:26:45 +05:00 |
|
|
749e89cbb3
|
Web: Components: fixed group-button-menu styles
|
2021-10-07 17:44:37 +03:00 |
|
|
19c8ee34c0
|
Web: Components: added drop down work in two modes
|
2021-10-05 16:54:45 +05:00 |
|
|
f14f6f965f
|
Web:Components:Catalog-item: fixed badge height
|
2021-10-05 19:23:48 +08:00 |
|
|
324ca6af20
|
Web:Common:Catalog: added default width and fix margins
|
2021-10-04 22:22:06 +08:00 |
|
|
96980d00b8
|
Web: Components: changed article panel width
|
2021-10-04 15:08:56 +03:00 |
|
Artem Tarasov
|
4a6738f898
|
Web: Common/Components/Files: deleted unnecessary code, refactoring
|
2021-10-01 11:05:03 +03:00 |
|
Artem Tarasov
|
e64a7f07de
|
Web: Common/Components/Files: fixed styles when selecting row
|
2021-09-30 10:55:26 +03:00 |
|
|
6921658ed3
|
Web:Components: changed hover background for catalog-item
|
2021-09-28 22:51:15 +08:00 |
|
|
a5c57fea52
|
Web: added catalog layout and document catalog
|
2021-09-27 20:59:37 +08:00 |
|
|
b324f5fbf4
|
added catalog-item
|
2021-09-23 16:08:08 +08:00 |
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/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/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
e6e49559a9
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-13 14:59:06 +05:00 |
|
|
1fe11360a8
|
Web: Components: added portals to drop-down
|
2021-09-13 14:56:02 +05:00 |
|
|
51c2341248
|
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-30 15:59:17 +03:00 |
|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
|
db7954ee31
|
Merge branch 'develop' into feature/backup
|
2021-06-30 15:54:45 +03:00 |
|
Artem Tarasov
|
4da80d3f0c
|
Web: Files: deleted unnecessary code
|
2021-06-30 10:50:06 +03:00 |
|
Artem Tarasov
|
d73bb73dab
|
Web: Components: rewrited component SwitchButton to ViewSelector
|
2021-06-29 15:27:46 +03:00 |
|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +03:00 |
|
|
b7ce849e32
|
Web: Components: Theme: Fixed line height for ComboBox component
|
2021-06-18 09:57:02 +03:00 |
|
Artem Tarasov
|
ee4760e899
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-11 18:30:44 +03:00 |
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
|
7e19a25b0c
|
Web: fixed text styles
|
2021-05-24 14:30:11 +03:00 |
|
|
b8460209d3
|
Web: Components/Settings: Refactoring.
|
2021-04-30 10:35:02 +03:00 |
|
Artem Tarasov
|
5d2264d483
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-04-27 13:40:38 +03:00 |
|
Alexey Kostenko
|
e187db767f
|
Web: Login: Updated field with buttons for login
|
2021-04-09 16:00:41 +03:00 |
|
Alexey Kostenko
|
6fadc94b71
|
Web: Components/People: Fixed social-button styles
|
2021-03-25 18:06:48 +03:00 |
|
Artem Tarasov
|
1d90de34ec
|
Web: Commponents: added SwitchButton component (from AppComponents)
|
2021-03-24 16:14:59 +03:00 |
|
Alexey Kostenko
|
e1df253b22
|
Web: People/Components: Added login settings buttons to edit profile page, social button - style fix
|
2021-03-23 18:29:29 +03:00 |
|
Artem Tarasov
|
dabf704485
|
Web: Client/Components: Wizard: layout fix
|
2021-03-18 22:55:15 +03:00 |
|
TatianaLopaeva
|
131de36293
|
Web: Components: combobox: Fixed styles of icon.
|
2021-03-18 13:45:22 +03:00 |
|
Alexey Kostenko
|
25b136eada
|
Web: Components: Files: Fixed row styles
|
2021-03-16 11:26:49 +03:00 |
|
Artem Tarasov
|
460b34a1a8
|
Web: Components: added themes for storybook
|
2021-03-14 21:10:16 +03:00 |
|
TatianaLopaeva
|
ccc45a8d74
|
Web: Components: checkbox: Fix displaying indeterminate color.
|
2021-03-02 20:15:27 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|