Commit Graph

4889 Commits

Author SHA1 Message Date
Dmitry Kulak
efbfb62e2f Web: Files: withLoader: Fixes 2022-01-19 15:35:15 +03:00
Dmitry Kulak
1a1d597a82 Web: Files: Tiles: Separated clashing styles for rename wrapper 2022-01-19 15:31:42 +03:00
Dmitry Kulak
da4b9d0db9 Web: Files: Tiles: Fixed option button padding 2022-01-19 15:29:17 +03:00
c8712954e2
Merge branch 'develop' into feature/redesign-tiles 2022-01-19 11:47:44 +03:00
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
0796169d76 refactoring 2022-01-14 10:42:43 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
1464d54283 fixed tests 2022-01-13 18:42:58 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
986d1d49e6 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-13 14:24:14 +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
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +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
a3e1d16146
Merge branch 'develop' into component-tooltips 2021-12-27 16:15:17 +03:00
99a5f3a29c Web:Files:Badges:Styling favorite badge. 2021-12-23 18:49:04 +03:00
dcc7986a90 map ICacheNotify<> to RedisCache<> 2021-12-23 18:27:58 +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
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
57d1d50f57 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-23 14:02:16 +03:00
2e0ca68d43 Merge branch 'develop' into feature/redesign-badges 2021-12-23 13:22:12 +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
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
fce3c57e8f Web:Files:Badges: Changed the conditions for displaying badges version. Changed style badge version New. 2021-12-22 16:20:23 +03:00
53c3775d15 Web:Files:Changed default column display for table view. Changed badges column key from Share to QuickButtons. 2021-12-22 15:20:47 +03:00
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
1bc044699f Web:Files:Badges:Сhanging the displayed content in TableRow. 2021-12-21 21:31:31 +03:00
561dbb3a65 Web:Files:Badges: Fixed styles badges for desktop view. 2021-12-21 20:52:24 +03:00
e1cf46f16f Web:Files:Badges: Added HOC withQuickButtons and quickButtonsComponent props to TableRow component. Styling badges for desktop view. 2021-12-21 20:35:02 +03:00
15f412e1a8 Web:Files:Tests: update codecept config 2021-12-21 18:24:28 +08:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
4caf3e4c50 Web:Files:Badges:Styling badges. 2021-12-21 10:22:22 +03:00
2fcf256e97 Web:Files:Badges: Fixed frame badges. 2021-12-20 18:09:23 +03:00
edd36d22cd Web:Files:Badges:Styling badges. 2021-12-20 16:58:47 +03:00
11e589ed81 Web:Files:Badges: Returned styles from SimpleFilesRow component to FilesRowContent. 2021-12-20 16:15:11 +03:00
6163f8427b Web:Files:Badges: Added new props lineHeight, textAlign to Badge styles. Added new conditions for resizing badges to the Badges and QuickButtons components. Added new props sectionWidth to HOCs withBadges and withQuickButtons. Styling badges. 2021-12-20 15:14:32 +03:00
dca7b8b76e Web:Files:Badges:Сhanging the displayed content in FilesRowContent. 2021-12-17 20:00:55 +03:00
cfd45e1444 Web:Files:Badges:Styling badges. 2021-12-17 15:37:42 +03:00
656fa2df89 edit translations 2021-12-17 10:14:40 +03:00
87a16df529 Web:Files:Badges:Styling badges. 2021-12-17 09:54:25 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
a62fe009df edit vi 2021-12-16 15:30:20 +03:00
780df07ae3 Web: Files: EmptyContainer: Added create form template button at empty root folder screen 2021-12-15 23:19:49 +03:00
28bc76b396 Web: Files: Delete translation key CreateWithEmptyTitle 2021-12-15 23:03:28 +03:00
302d044e58 Web:Files:Badges:Styling badges. 2021-12-15 19:47:02 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
f0f5246dad Web: Files: Delete translation key CreateWithEmptyTitle 2021-12-15 17:02:42 +03:00
8e6d87b9c8 Web: Files: HOC: Fixed bug, empty file / folder name field cancels its creation 2021-12-15 17:02:01 +03:00
a04b498cdf Web:Files:Badges:Added edit check for QuickButtons. 2021-12-15 16:45:54 +03:00
c3ce65d540 Web:Files:Badges:Сhange badges breakpoints. 2021-12-15 16:35:23 +03:00
daec1f5294 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-15 13:32:21 +03:00
21895d221b Web:Files:Badges:Added the logic for generating the content of the version badges. Moved the logic of displaying the badges pictures into constants in Badges, QuickButtons. Styling badges. 2021-12-15 11:50:59 +03:00
167fc202b5 Web:Files:Badges:Сhanged the display order of the version badges, added the tablet class badges.Added breakpoints for badges. 2021-12-14 18:54:02 +03:00
8e97763dd9 edit Home.json 2021-12-14 13:31:16 +03:00
Maria-Sukhova
2ecc3b01ea
Update Home.json 2021-12-14 13:24:33 +03:00
49f3955e07 edit translations 2021-12-14 13:17:23 +03:00
b7e532b7e9 Web:Files:Badges:Styling the new-items badges. 2021-12-13 21:03:28 +03:00
4eee5b49a2 add lo 2021-12-13 14:55:33 +03:00
65a7ae3df4 add translations el 2021-12-13 12:26:37 +03:00
f291945fc5 Web:Files:Badges:Fix SharedButton display. 2021-12-12 19:48:27 +03:00