|
|
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 |
|
|
|
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 |
|
|
|
2e0ca68d43
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-23 13:22:12 +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 |
|
