Commit Graph

6375 Commits

Author SHA1 Message Date
Viktor Fomin
24317a1980 Client: PortalSettings: Branding: fix 2023-08-09 14:05:07 +03:00
Viktor Fomin
af58252433 Client: expose BrandingPage, delete useless 2023-08-09 13:55:23 +03:00
Viktor Fomin
38f81e4b08 Merge branch 'feature/management' of https://github.com/ONLYOFFICE/DocSpace into feature/management 2023-08-09 13:09:00 +03:00
f13e9eaca7 Merge branch 'develop' into feature/management 2023-08-09 12:28:25 +03:00
Viktor Fomin
1188133b6d Client: PortalSettings: DataManagement: fix navigate 2023-08-09 11:58:39 +03:00
Viktor Fomin
9c956e0cd3 Client: PortalSettings: Backup: add dump param 2023-08-09 11:53:47 +03:00
Viktor Fomin
866f2c3d03 Client: expose BackupPage 2023-08-09 11:52:48 +03:00
d51185872b Web: fix empty Rooms loading 2023-08-07 12:23:02 +04:00
a7f412f118 Web: Replaced serve на local-web-server 2023-08-03 16:12:49 +04:00
81907e9247 Web: Client: Fix getting wrong scroll elements 2023-08-02 17:56:06 +02:00
31c0629bc5 Merge branch 'develop' into feature/rtl-interface-direction 2023-08-02 10:49:16 +02:00
Viktor Fomin
89b8673f99 Merge branch 'develop' into feature/management 2023-08-02 11:26:54 +03:00
2e12a2e8ad Web: Client: Apply changes by commits ea40ba3738 and 1b9dc04f30 after merge 2023-08-02 10:21:21 +03:00
d86fe1bc9d Web: Client: Apply changes by commit c56324863d after merge 2023-08-02 10:00:42 +03:00
12558b8520 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/components/panels/OperationsPanel/index.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	yarn.lock
2023-08-01 17:56:22 +03:00
Subhonbek
982d2f41ec Merge branch 'develop' into feature/rtl-interface-direction 2023-08-01 16:19:35 +03:00
Viktor Fomin
ae61e11974 Merge branch 'develop' into feature/management 2023-08-01 16:16:28 +03:00
51fb13d035 Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/pages/Files.jsx
#	packages/common/components/Navigation/Navigation.js
#	packages/common/components/Navigation/sub-components/control-btn.js
#	packages/common/components/Navigation/sub-components/plus-btn.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	yarn.lock
2023-08-01 14:39:31 +03:00
ea40ba3738 Web: Added error on empty files list on OperationPanel 2023-08-01 13:31:58 +04:00
Akmal Isomadinov
57292da345 Web:Client Fixed bug 63458 2023-07-31 20:43:12 +05:00
48da6bb520 Web: Client: Components: Move id to top div of Scrollbar component. Add class to wrapper element of Scrollbar 2023-07-31 17:18:05 +02:00
1b9dc04f30 Fixed Bug 63479 - Files.’Something went wrong’ on copy files 2023-07-31 14:59:33 +04:00
Viktor Fomin
46c589a6b7 Client: NavMenu: add customHeader 2023-07-29 19:04:09 +03:00
Viktor Fomin
dd0834fb04 Client: expose NavMenu 2023-07-29 17:51:01 +03:00
Viktor Fomin
379ce84517 Client: NavMenu: add hideProfileMenu 2023-07-29 17:50:50 +03:00
Viktor Fomin
92fb3499bb Client: expose PaymentsPage 2023-07-29 14:59:16 +03:00
30c4e4bbaa Web: bump version to v1.1.2 2023-07-28 21:03:52 +04:00
Akmal Isomadinov
c56324863d Web:Client Fixed bug 63436 2023-07-28 20:04:40 +05:00
Akmal Isomadinov
c183487146 Web:Store: Fixed bug 63386 2023-07-28 14:15:11 +05:00
45510eb3bc Merge branch 'develop' into feature/rtl-interface-direction 2023-07-28 10:10:35 +02:00
Viktor Fomin
94ace69c1f Client: PortalSettings: useIsSmallWindow 2023-07-28 01:54:56 +03:00
Viktor Fomin
8c3a9bc82a Client: PortalSettings: Branding: useIsSmallWindow 2023-07-28 01:38:28 +03:00
Viktor Fomin
47a9f7a367 Client: expose LoaderWhiteLabel 2023-07-28 01:28:32 +03:00
Viktor Fomin
528e7b97a7 Client: PortalSettings: Common: fix loaderWhiteLabel styles 2023-07-28 01:28:02 +03:00
Viktor Fomin
c36da266ea Client: expose BreakpointWarning 2023-07-28 01:14:57 +03:00
Viktor Fomin
1772d018cc Merge branch 'develop' into feature/management 2023-07-28 00:26:58 +03:00
Akmal Isomadinov
f8ec386c2c Web:Removed useless code 2023-07-27 18:54:32 +05:00
Akmal Isomadinov
d54af7953e Web:Client Fixed bug 63406 2023-07-27 18:46:50 +05:00
68f4ca779a Web: About: Added BUILD_AT on DocSpace title 2023-07-27 15:37:44 +04:00
39caff8634 web: fix display PublicRoomBar on Custom room 2023-07-27 15:18:49 +04:00
37efdc292a Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
#	packages/client/src/components/panels/HotkeysPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/components/date-time-picker/index.js
#	packages/components/selected-item/styled-selected-item.js
2023-07-26 17:47:13 +02:00
0e0e359368
Merge pull request #1572 from ONLYOFFICE/bugfix/fix-move-copy-toast
bugfix/fix-move-copy-toast
2023-07-26 19:33:19 +04:00
0d375cb414
Merge pull request #1573 from ONLYOFFICE/bugfix/fix-click-new-items
Fix page crash
2023-07-26 19:31:53 +04:00
f19364c9ef
Merge pull request #1575 from ONLYOFFICE/bugfix/fix-non-unique-id
Fix non unique ids
2023-07-26 19:31:25 +04:00
Viktor Fomin
9b015e0860 Merge branch 'develop' into feature/management 2023-07-26 18:29:38 +03:00
a46a82180c Web: Renamed translation 2023-07-26 18:56:07 +04:00
Viktor Fomin
5da205b488 Client: add wrapper for whitelabel 2023-07-26 12:31:46 +03:00
Viktor Fomin
331a8bb33d Client: ProfileActionsStore: add management item 2023-07-26 12:24:35 +03:00
2853735615 Web: Files: EditLinkPanel: fixed mobile view 2023-07-25 19:14:52 +03:00
a67f301608 Web: Files: fixed translations 2023-07-25 19:04:28 +03:00