Commit Graph

7610 Commits

Author SHA1 Message Date
56b4eece3d Web: Moved translations to Common file (pl). 2022-03-10 16:39:54 +03:00
4eae2cdb3c Web: Moved translations to Common file (pt). 2022-03-10 16:38:25 +03:00
34e1f835fe Web: Moved translations to Common file (pt-BR). 2022-03-10 16:36:25 +03:00
8ba131d52d Web: Moved translations to Common file (ro). 2022-03-10 16:33:31 +03:00
0c9713c65b Web: Moved translations to Common file (sk). 2022-03-10 16:31:02 +03:00
bff2518bf9 Web: Moved translations to Common file (sl). 2022-03-10 16:28:38 +03:00
500945a6da Web: Moved translations to Common file (tr). 2022-03-10 16:26:11 +03:00
e663d59aeb Web: Moved translations to Common file (vi). 2022-03-10 16:25:27 +03:00
297394f359 Web: Moved translations to Common file (uk). 2022-03-10 16:24:18 +03:00
8080e416df Web: Moved translations to Common file (zh-CN). 2022-03-10 16:23:06 +03:00
7bca87c34d Web: Moved translations to the Common (ru). 2022-03-10 16:21:24 +03:00
64dfd61858 Merge branch 'develop' into feature/backup 2022-03-10 12:15:26 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +03:00
74345b1c3c Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports 2022-03-03 12:37:54 +03:00
ba2fc9fe88 Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-03 12:33:42 +03:00
54cecbd5b3 Web: Files: fixed ContextOptionsStore errors 2022-03-03 12:29:48 +03:00
2cc05247db Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function 2022-03-02 15:15:03 +03:00
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +03:00
e5ba722f7c Web: Files: fixed withBadges, withContent HOCs re-render 2022-02-28 15:46:06 +03:00
2092430bcf Web: Files: fixed getting filesList 2022-02-28 11:03:42 +03:00
cae358636e
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 17:51:06 +03:00
04737a6c6d Web: Client: Files: Added fixedDirection property for AccessComboBox 2022-02-25 17:45:20 +03:00
dc78ff3a33 Web: Client: People: Added fixedDirection property for DateField 2022-02-25 16:48:12 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
7e50d1b097 Web: People: Profile: fixed help-icon styles 2022-02-25 13:41:47 +03:00
63d10f291f Web: Files: RowView: Fixed editing input style for screens less than small tablet 2022-02-25 12:18:27 +03:00
6c0f8c18e1 Web: Files: EditingWrapperComponent: Fixed padding for table view 2022-02-25 12:16:12 +03:00
64473bb70e Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 11:15:20 +03:00
e319a5e31f Web: Files: EditingWrapperComponent: Fixed padding for cancel button 2022-02-25 11:07:08 +03:00
8da91b7f8f Web: Files: VersionHistory fixed Ipad styles 2022-02-24 19:29:01 +03:00
159dfe0028 Web: Files: fixed VersionHistory page styles 2022-02-24 19:13:40 +03:00
4be97f77e7 Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view 2022-02-24 18:55:09 +03:00
9f5bae12ad Web: Files: fixed EditingWrapperComponent styles 2022-02-24 18:54:55 +03:00
7377507481 Web: Files: RowView: Fixed right margin for last badge item 2022-02-24 18:03:27 +03:00
7bc4e141fa Web: Files: RowView: Fixed displaying for quick buttons for small tablet width 2022-02-24 17:43:37 +03:00
7995f38ef9 Web: Files: Badges/QuickButtons: Restored show logic after merge 2022-02-24 16:36:06 +03:00
ba0bfe7260 Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
#	packages/asc-web-components/calendar/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2022-02-24 15:59:56 +03:00
2e000f1d9d Web: People: fixed profile dates 2022-02-24 15:48:02 +03:00
0814ce13cc Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 14:53:43 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00
9d0f1500e6 Files: fix routing 2022-02-24 13:24:39 +03:00
f59fbe71ba Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 12:04:15 +03:00
fab67e575c Web: Files: fixed files loader styles 2022-02-24 11:44:40 +03:00
34f6570027 Web: Files: fixed files loader 2022-02-24 11:42:33 +03:00
902b2b54eb Web: People: fixed table style 2022-02-24 11:33:58 +03:00
d7f16aa96d Web: Table: fixed table styles 2022-02-24 11:20:32 +03:00
d65d30ec24 Test: disable socketio 2022-02-23 17:10:04 +03:00
81b33e673a Files: fix warnings 2022-02-23 17:09:32 +03:00
3d4e000778 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-02-23 16:01:55 +03:00