Commit Graph

203 Commits

Author SHA1 Message Date
Timofey
092d870f69 Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input 2022-02-09 19:54:45 +08:00
Timofey
0bf9116f91 Web:Common:PageLayout: set catalog height on mobile devices 2022-02-07 22:27:05 +08:00
Timofey
2b23aae93f Web:Common:PageLayout: fix margin-top on mobile devices for catalog 2022-02-07 21:30:31 +08:00
Timofey
e0ba6ebcb1 Web:Common:Components: delete top css property for catalog 2022-02-04 23:24:39 +08:00
Timofey
1c80398617 Web:Common:Catalog: refactoring catalog components and add support dark-theme 2022-02-04 21:21:30 +08:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
Timofey
20b4a691dd Web:Common:Components: enable floating buttons with secondary and primary progress on desktop 2022-02-03 16:34:47 +08:00
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08:00
Timofey
7c61e54a7b Web:Common:Components: refactoring navigation component 2022-02-02 19:24:35 +08:00
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08:00
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
Timofey
91f0213c51 Web:Common:Components: disable floating button on mobile and tablet devices 2022-01-31 23:46:41 +08:00
Timofey
95353b1b4e Web:Common:Components: disable floating button on mobile devices 2022-01-31 21:40:43 +08:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
Timofey
293de829bd Web:Files:Catalog: add main button mobile on mobile and tablet devices 2022-01-27 17:13:49 +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
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08:00
Timofey
c6c651974d Web:Common:PageLayout: update margin for section filter components 2022-01-20 20:05:53 +08:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03: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
d46679e9bb Web:Common:PageLayout: add support dark-theme for section 2021-12-25 00:50:45 +08:00
e7854ed5d8 Web:Common:PageLayout:Article: add support dark-theme 2021-12-14 16:14:36 +08:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00
7a00dba491 Merge branch 'develop' into feature/navigation 2021-12-02 14:53:42 +08:00
52626a548e Web: fixed Snackbar styles 2021-11-22 15:01:33 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
56d16ac2f4
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
2021-11-08 15:38:45 +03:00
5c5db26dc4 Web: Files: removed unused code 2021-11-08 14:04:52 +03:00
a876ce8b67 Web:Common:PageLayout: add catalog in readme and storybook 2021-11-08 17:23:56 +08:00
bf4126cc0e Web: Deleted console.log. 2021-11-03 15:25:04 +03:00
da8e34930f Web: Added prop. 2021-11-03 11:59:54 +03:00
2d60dbee1b Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 11:58:56 +03:00
72adefec39 Web: Deleted useless code after Cherry Pick. 2021-11-03 10:35:03 +03:00
706913275c Web: Common: PageLayout: Fixed error "Cannot read properties of null (reading 'focus')". 2021-11-03 09:57:56 +03:00
06437454a8 Web: Deleted useless code. 2021-11-03 09:57:55 +03:00
6fb6f3db60 Web: SectionBody: Deleted useless code. 2021-11-03 09:57:53 +03:00
6cf7c6d43e Web: Common: PageLayout: Refactoring, deleted useless code.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:57:51 +03:00
76b4251559 Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:57:12 +03:00
44f2a1c17f Web: Common: Fixed styles for body list without scroll.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:54:16 +03:00
5759758f71 Bug 53416 - Client.Files.Desktop: Fixed scrolls under Ubuntu. 2021-11-02 18:41:33 +03:00
68a8683e13 Merge branch 'develop' into feature/navigation 2021-11-02 22:46:04 +08:00
c32e4999b4 Merge branch 'develop' into feature/navigation 2021-11-02 22:45:25 +08:00
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	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
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
dcb8f108b8 Web: Files: fixed Paging re-render 2021-10-28 11:30:23 +03:00
68b2108bcb Web: Common: PageLayout: Fixed padding for first row element at desktop view 2021-10-26 20:37:28 +03:00