|
3b9a099996
|
Merge branch 'develop' into refactoring/refactoring-context-menu
|
2022-03-05 15:47:14 +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 |
|
|
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 |
|
|
23fca4c041
|
Web: Components: fixed context-menu model
|
2022-03-03 12:56:51 +03:00 |
|
|
54cecbd5b3
|
Web: Files: fixed ContextOptionsStore errors
|
2022-03-03 12:29:48 +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 |
|
mushka
|
16e83aedac
|
added auto focus offset
|
2022-03-01 14:45:14 +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 |
|
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 |
|
|
496b55c5a6
|
Web: Common: FilterInput: Added fixedDirection property
|
2022-02-25 17:11:36 +03: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 |
|
|
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 |
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03: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 |
|
|
356e00ceed
|
Web: Components: Calendar: fixed disabled months
|
2022-02-18 11:30:47 +03:00 |
|
mushka
|
3bededc084
|
added auto offset
|
2022-02-18 01:59:46 +03:00 |
|
mushka
|
5f565382f7
|
added drag-scrolling, working on auto-offset
|
2022-02-17 17:01:04 +03:00 |
|