Commit Graph

15977 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
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
d3c1dfde9f backup: refactoring 2022-01-18 09:59:49 +03:00
Artem Tarasov
f2459ffc78 Web: Doceditor: deleted dir 'webpack' with config 2022-01-17 18:36:55 +03:00
Artem Tarasov
6cc69ac47b Web: Doceditor: added nextjs 2022-01-17 18:35:43 +03:00
bcbabe63e9
Merge pull request #490 from ONLYOFFICE/feature/refactoring-backup-service
Feature/refactoring backup service
2022-01-17 18:32:33 +03:00
ee8cb969bf backup: refactoring 2022-01-17 18:03:28 +03:00
a9da66f2b5 backup: refactoring 2022-01-17 14:15:46 +03:00
Dmitry Kulak
8e62da40a3 Web: Files: Tiles: Removed unused code 2022-01-14 17:46:52 +03:00
Artem Tarasov
c10c60a148 Merge branch 'develop' into feature/doceditor-ssr 2022-01-14 13:03:40 +03:00
a7648624a6
Merge pull request #488 from ONLYOFFICE/feature/support-elasticache
Feature/support elasticache
2022-01-14 11:21:54 +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
a1ff0a84bf
Merge pull request #483 from ONLYOFFICE/feature/redesign-badges
Feature/redesign badges
2022-01-13 12:44:00 +03:00
73ee837763
Merge branch 'develop' into feature/redesign-badges 2022-01-13 12:08:18 +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
5bd347a775 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-12 12:58:07 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
Artem Tarasov
ceb11e78ee Web: DocEditor: fix after merge 2022-01-11 14:13:26 +03:00
Artem Tarasov
6b954d45f5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/webpack.config.js
2022-01-11 14:11:47 +03:00
Artem Tarasov
7fc992c9f4 Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render() 2022-01-11 12:59:03 +03:00
Artem Tarasov
c7121997f3 Web: DocEditor: webpack.config.js is split into separate files 2022-01-11 12:57:07 +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
3793c5ae43 Web:Components:Tree-Menu:Added props lineHeight for the badge in index.js for the tree-menu component. 2022-01-10 16:30:23 +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
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
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