mushka
|
338c66720b
|
resolved missed merge conflicts
|
2022-03-14 19:10:10 +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 |
|
mushka
|
4e6d79eda2
|
change gap between loader and text from 8 to 12px
|
2022-03-14 18:36:00 +03:00 |
|
mushka
|
7537292369
|
fixed padding-forced vertical discentering bug
|
2022-03-14 18:28:46 +03:00 |
|
mushka
|
e614136645
|
small tweaks
|
2022-03-14 18:26:13 +03:00 |
|
|
|
d5f5bcc37a
|
Web: Components: EmailInput: fix
|
2022-03-14 14:18:10 +03:00 |
|
|
|
38e280a286
|
Web: Components: PasswordInput: fix
|
2022-03-14 12:19:01 +03:00 |
|
mushka
|
1a80691c61
|
added icon styles and enlarged gap between icon and text
|
2022-03-11 19:43:17 +03:00 |
|
|
|
58eb82acff
|
Merge pull request #515 from ONLYOFFICE/feature/hotkeys
Feature/hotkeys
|
2022-03-11 19:09:21 +03:00 |
|
|
|
19e657e738
|
Web:Components:Styling SaveCancelButtons.
|
2022-03-11 18:04:26 +03:00 |
|
mushka
|
cd93ed2e2b
|
remove unnecessary .btnIcon class and Icon component
|
2022-03-11 17:34:14 +03:00 |
|
mushka
|
546f7bc4a7
|
fixed horizontal alignment bugs
|
2022-03-11 17:21:52 +03:00 |
|
mushka
|
befd64b93c
|
Remved loaders from Scale and fixed labels on Hover/Fixed/Disabled templates
|
2022-03-11 15:31:21 +03:00 |
|
mushka
|
52f36bce92
|
fixed withIcon padding
|
2022-03-11 15:26:52 +03:00 |
|
mushka
|
588ce13e08
|
deleted commented visual intends
|
2022-03-11 14:18:11 +03:00 |
|
mushka
|
88da9381f4
|
changed description
|
2022-03-11 14:16:17 +03:00 |
|
mushka
|
30c63620a3
|
change default size to extraSmall
|
2022-03-11 13:46:32 +03:00 |
|
mushka
|
25ad35ab6a
|
added Normal Touchscreen/Desktop differentiation
|
2022-03-11 13:41:48 +03:00 |
|
|
|
e62c1a5f59
|
Web:Components:Added white arrowColor for dark theme.
|
2022-03-10 18:27:14 +03:00 |
|
|
|
ce7c2aab6e
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-10 17:10:31 +03:00 |
|
|
|
5a6eba1b5e
|
Web: Files: fixed renderContext
|
2022-03-10 16:39:03 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +03:00 |
|
mushka
|
0d2c626445
|
design tweaks
|
2022-03-10 15:35:26 +03:00 |
|
mushka
|
959c8f1e99
|
redesigned buttons
|
2022-03-10 15:14:08 +03:00 |
|
|
|
b8be01dca3
|
Web:Components:Styling the SaveCancelButtons component.
|
2022-03-10 14:46:55 +03:00 |
|
Timofey Boyko
|
c45baeb3c9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-10 14:01:29 +03:00 |
|
|
|
4a68b32583
|
Web: Components: EmailInput: add disallow char
|
2022-03-10 11:08:10 +03:00 |
|
|
|
2a045fc1ef
|
Web: Files: removed contextMenuData, moved getContextModel to withFileActions HOC
|
2022-03-10 10:09:10 +03:00 |
|
|
|
f401926098
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-09 11:56:03 +03:00 |
|
Timofey Boyko
|
fab58673ab
|
Web:Components: remove new-context-menu and menu-item from components
|
2022-03-09 10:28:36 +03:00 |
|
Timofey Boyko
|
98ac515760
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-05 18:51:07 +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 |
|
|
|
84810de125
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-components/context-menu/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
|
2022-03-05 17:52:01 +03:00 |
|
Timofey Boyko
|
d85ae13b7a
|
Web:Files: fix table view in dark-theme
|
2022-03-05 17:47:56 +03:00 |
|
Timofey Boyko
|
ab51a985cd
|
Web:Components:MainButtonMobile: fix dropdown render
|
2022-03-05 16:56:50 +03:00 |
|
|
|
3b9a099996
|
Merge branch 'develop' into refactoring/refactoring-context-menu
|
2022-03-05 15:47:14 +03:00 |
|
|
|
cd3fc944f9
|
Web: Components: fix tooltip valid color
|
2022-03-05 11:49:54 +03:00 |
|
|
|
11708952e9
|
Web: People: fixed context-menu
|
2022-03-05 10:48:27 +03:00 |
|
|
|
291052112d
|
Web: People: fixed TableRow
|
2022-03-05 10:22:53 +03:00 |
|
Timofey Boyko
|
a2e9518d3d
|
Web:Common: add 1.2.1 view styles and scroll for context menu
|
2022-03-04 20:55:28 +03:00 |
|
|
|
9c9534038f
|
Merge branch 'develop' into feature/slider-redesign
|
2022-03-04 18:57:51 +05:00 |
|
|
|
47358b007e
|
Web: Components: added style prop
|
2022-03-04 18:56:57 +05:00 |
|
|
|
7bfcc8b249
|
Web: Components: create slider component
|
2022-03-04 18:54:57 +05:00 |
|
|
|
250eeaaa60
|
Web: Components: fixed slider margin
|
2022-03-04 18:54:14 +05:00 |
|
|
|
ba29c3aee0
|
Web: Components: moved slider to components
|
2022-03-04 18:53:41 +05:00 |
|
|
|
4469936b1d
|
Web: Components: ModalDialog: add width prop
|
2022-03-03 17:51:03 +03:00 |
|
|
|
23fca4c041
|
Web: Components: fixed context-menu model
|
2022-03-03 12:56:51 +03:00 |
|
|
|
f161598193
|
Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-03 12:54:59 +03:00 |
|
|
|
8411255de0
|
Web: Components: add more tests
|
2022-03-03 12:54:35 +03:00 |
|
|
|
54cecbd5b3
|
Web: Files: fixed ContextOptionsStore errors
|
2022-03-03 12:29:48 +03:00 |
|
|
|
2978adcdf3
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-02 18:18:05 +03:00 |
|
|
|
2cc05247db
|
Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function
|
2022-03-02 15:15:03 +03:00 |
|
Timofey Boyko
|
5ea4f18276
|
Web:Components: fix render context menu on tablet and mobile
|
2022-03-02 13:01:32 +03:00 |
|
|
|
511592ddb7
|
Merge branch 'develop' into feature/login-redesign
|
2022-03-02 12:08:11 +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 |
|
mushka
|
16e83aedac
|
added auto focus offset
|
2022-03-01 14:45:14 +03: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 |
|
mushka
|
2378a32ddb
|
eventListener, autoScrollinng tweaks
|
2022-02-28 17:58:59 +03:00 |
|
mushka
|
f54a8fbb19
|
autoScrolling tweaks
|
2022-02-28 17:55:18 +03:00 |
|
mushka
|
509104ad4a
|
refactor _key to id
|
2022-02-28 17:16:15 +03:00 |
|
mushka
|
e1207aabb2
|
added event unsubscription
|
2022-02-28 17:06:56 +03:00 |
|
mushka
|
89d5cd376e
|
rename tw to textWidth
|
2022-02-28 17:00:32 +03:00 |
|
mushka
|
775bdf44c7
|
rename gaps
|
2022-02-28 16:51:17 +03:00 |
|
|
|
9aff975cd4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-28 16:17:48 +03:00 |
|
mushka
|
7b35ffc094
|
pull fix
|
2022-02-28 16:11:44 +03:00 |
|
mushka
|
1832566978
|
fix markedNoItem bug
|
2022-02-28 16:08:15 +03:00 |
|
mushka
|
18b022bb93
|
smalll fixes
|
2022-02-28 16:08:14 +03:00 |
|
mushka
|
423f39c8d3
|
added auto offset
|
2022-02-28 16:08:12 +03:00 |
|
mushka
|
ce73a703a4
|
added drag-scrolling, working on auto-offset
|
2022-02-28 16:08:11 +03:00 |
|
mushka
|
1c5d810a95
|
fixed media
|
2022-02-28 16:08:10 +03:00 |
|
mushka
|
044267aaa4
|
last review based changes
|
2022-02-28 16:08:10 +03:00 |
|
mushka
|
8fac847f01
|
rm tabs-container.test.js
|
2022-02-28 16:08:09 +03:00 |
|
mushka
|
d2d6f03621
|
small fixes
|
2022-02-28 16:08:08 +03:00 |
|
mushka
|
446f620dc1
|
completed submenu
|
2022-02-28 16:08:07 +03:00 |
|
|
|
fe03e28e2b
|
Merge branch 'develop' into feature/submenu
|
2022-02-28 15:39:01 +03:00 |
|
Timofey
|
a1ee3e03fb
|
Web:Components:NewContextMenu: add data-set as props to menu-item
|
2022-02-28 16:03:03 +08:00 |
|
Timofey
|
7263405daa
|
Web:Components:NewContextMenu: add special name for options for e2e tests
|
2022-02-28 15:35:06 +08:00 |
|
|
|
2bdc8d5d28
|
Web: Components: DropDown: Simplify checking dimensions for DropDown without parent ref
|
2022-02-25 16:49:28 +03:00 |
|
|
|
b268b30d36
|
Web: Components: DatePicker: Added fixedDirection property
|
2022-02-25 16:46:56 +03:00 |
|
|
|
0021ee47f5
|
Web: Components: Calendar: Fixed combobox direction
|
2022-02-25 16:12:01 +03:00 |
|
|
|
b016e3b38f
|
Web: Components: Calendar: Added fixedDirection property
|
2022-02-25 16:07:54 +03:00 |
|
|
|
d21bb11939
|
Web: Components: Combobox: Added fixedDirection property
|
2022-02-25 16:07:39 +03:00 |
|
|
|
de742ef46d
|
Web: Components: DropDown: Added fixedDirection property
|
2022-02-25 16:07:18 +03:00 |
|
|
|
73dfb927cf
|
Web: Components: DropDown: Fixed position checking for non portal
|
2022-02-25 15:30:30 +03:00 |
|
|
|
f2a8867a4c
|
Merge branch 'bugfix/fixed-dates-in-profile' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-dates-in-profile
|
2022-02-25 12:18:22 +03:00 |
|
|
|
d255872c2a
|
Web: Components: Combobox: added displaySelectedOption prop
|
2022-02-25 12:18:10 +03:00 |
|
|
|
64473bb70e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 11:15:20 +03:00 |
|
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
Timofey
|
337497c5d5
|
Web:Common: add circle indicator if filter is active
|
2022-02-24 16:36:59 +08:00 |
|
|
|
d7f16aa96d
|
Web: Table: fixed table styles
|
2022-02-24 11:20:32 +03:00 |
|
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03: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 |
|
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
Timofey
|
aa91c011d8
|
Web:Common: refactoring new filter input and add support group selector
|
2022-02-22 17:10:13 +08:00 |
|
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +03: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 |
|
