Commit Graph

15816 Commits

Author SHA1 Message Date
Artem Tarasov
a04235b260 Web: Common/Studio: moved tryRedirectTo() to separate file (ssr crash) 2022-02-02 18:28:29 +03:00
Artem Tarasov
1d0bd0bf8b Web: Doceditor: change remoteApiUrl 2022-01-28 13:52:20 +03:00
Artem Tarasov
1e6d2f1e1c Web: Editor: added global styles 2022-01-28 13:51:23 +03:00
Artem Tarasov
7f3878afc5 Web: Doceditor: created route product/files/doceditor. removed [...slug].js page 2022-01-28 13:50:09 +03:00
Artem Tarasov
9e32295fae Web: Editor: added [...slug].js (index.page) 2022-01-27 16:54:40 +03:00
Artem Tarasov
96f15bc2a3 Web: Editor: added _app.js and _document.js (styled-components for ssr) 2022-01-27 16:53:41 +03:00
Artem Tarasov
d3eecfe477 Web: Common: Api: added client-ssr 2022-01-27 16:48:15 +03:00
Artem Tarasov
8674d500ae Web: Editor: added nextjs config 2022-01-27 16:46:41 +03:00
Artem Tarasov
1ec56b19de Web: Editor: added nextjs 2022-01-27 16:45:36 +03:00
Artem Tarasov
be750d3f6b Web: Components: fix when ssr 2022-01-21 19:47:45 +03:00
Artem Tarasov
368989eae5 Config: nginx: added rule for nextjs (editor) 2022-01-21 01:17:01 +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
Artem Tarasov
c10c60a148 Merge branch 'develop' into feature/doceditor-ssr 2022-01-14 13:03:40 +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
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +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
5fb4de9537 Web:Files:Badges:Added check for isTablet device for row view. 2021-12-30 14:29:46 +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
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
14783ee105
Merge pull request #485 from ONLYOFFICE/release/v1.1.0
Release/v1.1.0
2021-12-27 20:39:18 +03:00
50cb570eff Web:Components:Fix the style of the table header. 2021-12-24 15:17:33 +03:00
d7faf84a44 Web:Files:Badges:Changed the default lineHeight for the Badge component. 2021-12-24 12:02:15 +03:00
5e088d3ba8 Jenkins: fix build 2021-12-23 21:54:42 +03:00
44b227ba98 NLog: maxArchiveDays 2021-12-23 21:49:02 +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