Commit Graph

6968 Commits

Author SHA1 Message Date
Dmitry Kulak
2876ef58ef Web: Files: Tiles: Fixed quick buttons appearance conditions 2022-01-19 11:23:46 +03:00
Dmitry Kulak
e21b7a2176 Web: Files: Tiles: Refactoring 2022-01-19 11:05:59 +03:00
Dmitry Kulak
6cb00cd777 Web: Files: Tiles: Added quick buttons, refactoring 2022-01-18 19:19:56 +03:00
Dmitry Kulak
8e62da40a3 Web: Files: Tiles: Removed unused code 2022-01-14 17:46:52 +03:00
Dmitry Kulak
fe75b6fa32 Merge branch 'develop' into feature/redesign-tiles 2022-01-13 13:59:50 +03:00
5c5aac9244 Web:Files:Removed momentJS from DateCell and FilesRowContent components. Combined the getStatusByDate and getTableStatusByDate methods into the getStatusByDate method in the withContent HOC`s. Added parameters for the toLocaleString method in the getStatusByDate method. Replaced the comma from date string inside the getStatusByDate method. 2022-01-12 15:33:30 +03:00
d3de3a11f2 Web:Files:Badges:Styling badges. 2022-01-10 18:08:56 +03:00
3522dea939 Web:Files:Badges:Fix props lineHeightBadge for table view. 2022-01-10 16:30:37 +03:00
1d83359aa7 Web:Files:Badges:Added check for isTablet for tablet badges view. Added changing the font size of badges depending on the view. 2022-01-10 15:50:26 +03:00
5a193e50f8 Web:Files:Badges:Fixed styles badges.Removed inactive lock and favorite badges in mobile view. 2022-01-08 13:58:29 +03:00
7a47ff8fc9 Web:Files:Badges:Styling badges. 2022-01-08 00:13:19 +03:00
a7da94a8a2 Web:Files:Badges:Styling badges in a mobile view. 2022-01-07 19:27:49 +03:00
6a1a9d2bf3 Web:Files:Badges:Disabled display of Share on mobile device when row view. 2021-12-30 18:57:07 +03:00
5fb4de9537 Web:Files:Badges:Added check for isTablet device for row view. 2021-12-30 14:29:46 +03:00
Dmitry Kulak
e014ff614e Web: Files: Tiles: Loaders aligned with content, fixes 2021-12-30 10:55:16 +03:00
Dmitry Kulak
fd7a5d97f2 Web: Files: Tiles: Fixed styles for name renaming 2021-12-29 18:45:47 +03:00
1645386669 Fix after merge 2021-12-29 18:30:05 +03:00
493a112811 Merge branch 'feature/redesign-badges' of github.com:ONLYOFFICE/AppServer into feature/redesign-badges 2021-12-29 16:41:09 +03:00
Dmitry Kulak
b5bcf38456 Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles 2021-12-29 15:48:41 +03:00
Artem Tarasov
3b75038803 Merge branch 'develop' into feature/redesign-badges
# Conflicts:
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/Icons.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	public/images/access.edit.react.svg
2021-12-29 15:45:33 +03:00
df6a18db6a Merge branch 'develop' into feature/redesign-badges 2021-12-29 14:11:44 +03:00
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03: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
83f4c0dbef Web:Files:Badges: Refactoring. 2021-12-28 14:37:56 +03:00
57a7ae2c62 Web:Files:Badges:Styling badges. 2021-12-28 13:57:31 +03:00
420d8e1939 Web:Components:Badges:Removed the SharedButton component. 2021-12-28 13:29:57 +03:00
15c645489f Web:Components:Badges:Moved SharedButton to component QuickButtons. Moved the onClickShare method to HOC withQuickButtons. Removed SharedButton from the FilesTile component. Added quickButtonsComponent and HOC withQuickButtons to FilesTile component. 2021-12-28 13:03:10 +03:00
Dmitry Kulak
57c2460c3e Web: Files: Tiles: Redesign, refactoring 2021-12-27 18:46:26 +03:00
99a5f3a29c Web:Files:Badges:Styling favorite badge. 2021-12-23 18:49:04 +03:00
134000038a Web:Files:Added VersionBadge translation to FilesTableRow component. 2021-12-23 18:06:54 +03:00
f9f1438df9 Web:Files:Badges: Fixed styles badges. 2021-12-23 17:59:38 +03:00
a0336d310e Web:Files:Added translation VersionBadge to locales for en, ru. Added VersionBadge translation to FilesRowContent component. 2021-12-23 17:08:32 +03:00
dc7b2675f3 Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders 2021-12-23 16:29:21 +03:00
57d1d50f57 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-23 14:02:16 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
2e0ca68d43 Merge branch 'develop' into feature/redesign-badges 2021-12-23 13:22:12 +03:00
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +03:00
Dmitry Kulak
1f4ce11734 Web: Files: Tiles: Loaders redesign 2021-12-23 12:32:46 +03:00
Dmitry Kulak
18aa0121f9 Web: Files: Tiles: Renaming redesign, fixes 2021-12-23 12:32:45 +03:00
Dmitry Kulak
c4c897028c Web: Files: Tiles: Refactoring 2021-12-23 12:32:43 +03:00
Dmitry Kulak
22e446db94 Web: Files: Tiles: Badges redesign 2021-12-23 12:32:41 +03:00
Dmitry Kulak
37fb1b2081 Web: Files: Tiles: Removed file extension from file title 2021-12-23 12:32:40 +03:00
Dmitry Kulak
9d06c87dde Web: Files: Tiles: File tiles and layout redesign 2021-12-23 12:32:40 +03:00
Dmitry Kulak
23afa67e31 Web: Files: Tiles: Folder tile redesign, made file icons bigger 2021-12-23 12:32:38 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
ef853d5d2f Web:Files:Removed the Icons and SimpleRowContent components. 2021-12-22 18:50:25 +03:00
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00