|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
7e19a25b0c
|
Web: fixed text styles
|
2021-05-24 14:30:11 +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 |
|
