Commit Graph

16092 Commits

Author SHA1 Message Date
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
b1c7ef68e7 Web:Components:Row:Changed the render to ContentElement. 2021-12-30 18:54:41 +03:00
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
50698af649 analizators/s3168 2021-12-30 15:28:14 +03:00
b9ae9b7335 analizators/s2583 2021-12-30 15:12:44 +03:00
6c32e34b40 analizators/s1848 2021-12-30 15:04:47 +03:00
1c29b81a9a analizators/s1848 2021-12-30 15:01:20 +03:00
5fb4de9537 Web:Files:Badges:Added check for isTablet device for row view. 2021-12-30 14:29:46 +03:00
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
8f53895e3d analizators/s2201 2021-12-30 14:03:05 +03:00
3d33fecf77 analizators/s2259 2021-12-30 14:00:03 +03:00
555ca30c99 analizators/s2259 2021-12-30 13:23:01 +03:00
e2857e87f5 analizators/s2997 2021-12-30 12:52:44 +03:00
2a82bc884e analizators/s2583 2021-12-30 12:44:25 +03:00
Dmitry Kulak
e014ff614e Web: Files: Tiles: Loaders aligned with content, fixes 2021-12-30 10:55:16 +03:00
abd72b9e0d analizators/s3903 2021-12-29 18:49:02 +03:00
973f8a41b9 analizators/s2259 2021-12-29 18:47:35 +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
632783b130 analizators/s4275 2021-12-29 18:12:39 +03:00
facc97b01c analizators/s4423 2021-12-29 17:41:02 +03:00
877095f525 analizators/s3923 2021-12-29 17:40:19 +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
5630e0b6bf Files: fix 2021-12-28 20:21:22 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
f244266378 analizators/s3966 2021-12-28 18:50:54 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +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
Vashchuk Nikita
0876c22f6f spreading async in Files 2021-12-28 18:15:29 +03:00
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +03:00
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
28e1c652d9 analizators/s4456 2021-12-28 16:39:44 +03:00
ee79cecf36 analizators/s4457 2021-12-28 16:19:53 +03:00
c3321206bd analizators/s4487 2021-12-28 16:08:11 +03:00
af1c812cac analizators/s4586 2021-12-28 15:03:12 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
352a8b61ff analizators/s5034 2021-12-28 14:54:10 +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
Vashchuk Nikita
6e4eff9ce3 added async to FileSecurity 2021-12-27 20:52:40 +03:00
Vashchuk Nikita
46a3630aa8 Merge branch 'feature/async' of github.com:ONLYOFFICE/AppServer into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Model/FolderContentWrapper.cs
2021-12-27 20:41:10 +03:00
14783ee105
Merge pull request #485 from ONLYOFFICE/release/v1.1.0
Release/v1.1.0
2021-12-27 20:39:18 +03:00
Dmitry Kulak
57c2460c3e Web: Files: Tiles: Redesign, refactoring 2021-12-27 18:46:26 +03:00