|
|
643bf726b3
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-23 16:10:11 +05:00 |
|
|
|
a2ad2b450f
|
Web: Components: CampaignsBanner: fix style
|
2022-03-22 17:43:28 +03:00 |
|
|
|
d13ef622f8
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-22 14:16:20 +05:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +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 |
|
|
|
bbe35750f5
|
Merge branch 'develop' into hotfix/campaigns-banner
|
2022-02-28 19:08:13 +05:00 |
|
|
|
15830a9fe0
|
Fix bug 53339: open banner link in new tab
|
2022-02-16 18:03:21 +03:00 |
|
|
|
b9f6ec6615
|
Web: Components: fix banner loader
|
2022-02-15 11:58:12 +03:00 |
|
|
|
3a636670d2
|
Web: Components: fix banner loader
|
2022-02-14 17:56:50 +03:00 |
|
|
|
d0bc7cc223
|
Fix bug 53339: open banner link in new tab
|
2022-01-22 17:30:00 +03:00 |
|
Timofey
|
4598d238e5
|
Web:Components: update dark theme after merge branch 'develop'
|
2022-01-20 23:29:09 +08:00 |
|
|
|
0b84450f7a
|
Web: Components: campaigns-banner: delete useless
|
2022-01-17 22:03:09 +03:00 |
|
|
|
dd415b0497
|
Web: Components: fix image height
|
2021-11-11 17:21:49 +03:00 |
|
|
|
21a9f115f1
|
Web: Components: add banner loaders
|
2021-11-08 13:36:09 +03:00 |
|
|
|
ff93590189
|
Web: Components: fix loader height
|
2021-11-02 15:36:12 +03:00 |
|
|
|
fb75330cb0
|
Fix bug 53339: open banner link in new tab
|
2021-11-01 13:52:44 +03:00 |
|
|
|
9f33461d38
|
Web: Components: fix color banner button
|
2021-09-14 16:03:21 +03:00 |
|
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
|
8e6fa7f5fa
|
Web: Components: added banner img loader
|
2021-09-08 10:35:36 +03:00 |
|
|
|
1fdb42a53a
|
Fix Error 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries.
|
2021-09-01 15:25:20 +03:00 |
|
|
|
c834c7615a
|
Web: Components: fixed banner button color
|
2021-07-27 12:47:55 +03:00 |
|
|
|
57b485906c
|
Web: Components: fixed banner margin
|
2021-07-02 18:08:04 +03:00 |
|
|
|
749728d085
|
Web: Components: fixed banner width
|
2021-07-02 13:21:54 +03:00 |
|
|
|
6fa5368336
|
Web: Components: fixed banner sub-header line height
|
2021-07-01 15:18:02 +03:00 |
|
|
|
bca3f0f3d8
|
Web: Components: fixed banner width for tablet
|
2021-07-01 14:36:48 +03:00 |
|
|
|
79c7a461d7
|
Web: Components: fixed banner width
|
2021-07-01 13:46:18 +03:00 |
|
|
|
a489e73245
|
Web: Components: fixed banner styles
|
2021-07-01 12:23:20 +03:00 |
|
|
|
e2adbff10f
|
Web: Components: fixed banner styles
|
2021-07-01 11:52:56 +03:00 |
|
|
|
a4929bbdd4
|
Web: Components: fixed banner style
|
2021-07-01 11:23:39 +03:00 |
|
|
|
fe1a787d1b
|
Web: Components: disabled hover button in banner
|
2021-07-01 10:51:47 +03:00 |
|
|
|
348a0577e7
|
Web: Components: fixed banner
|
2021-07-01 00:50:15 +03:00 |
|
|
|
0d3f441fd5
|
Web: Components: added body link for banner
|
2021-07-01 00:28:58 +03:00 |
|
|
|
6fe51a936e
|
Web: Components: added campaigns banner test
|
2021-06-30 18:35:25 +03:00 |
|
|
|
1edb2662f1
|
Web: Components: added campaigns banner storybook
|
2021-06-30 18:31:44 +03:00 |
|
|
|
be88eae6bf
|
Web: Components: added campaigns banner
|
2021-06-30 18:10:16 +03:00 |
|
