Commit Graph

6343 Commits

Author SHA1 Message Date
f272f406ea Web: Files: hidden thirdparty block 2023-08-09 14:24:00 +03:00
d51185872b Web: fix empty Rooms loading 2023-08-07 12:23:02 +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
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
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
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
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
a46a82180c Web: Renamed translation 2023-07-26 18:56:07 +04: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
cffbf97517 Web: Files: EditLinkPanel: fixed onCopyClick 2023-07-25 19:01:13 +03:00
1b8fb5ca59 Web: Files: EmbeddingBody: fixed CodeCopySuccess translation 2023-07-25 19:00:48 +03:00
960e0655bb Web: Files: fixed table after merge 2023-07-25 18:51:16 +03:00
3d3f244cc1 Web: Files: fixed RoomSharingDialog styles 2023-07-25 18:32:22 +03:00
f4e2f76fff Web: Editor: fixed goBack 2023-07-25 18:27:43 +03:00
a1a2d5aa4a Web: Files: fixed files open 2023-07-25 17:59:25 +03:00
7917549533 Web: Files: fixed double share url 2023-07-25 17:44:56 +03:00
2e42741e4b Web: Files: fixed public-room error after added new file 2023-07-25 17:27:11 +03:00
28b8bc346e Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
#	.gitignore
#	packages/common/store/SettingsStore.js
#	packages/components/file-input/styled-file-input.js
#	packages/components/modal-dialog/styled-modal-dialog.js
#	yarn.lock
2023-07-25 14:01:29 +02:00
f3765018f1 Web: bump version 2023-07-25 14:02:50 +04:00
7d727e0842 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
2023-07-25 13:01:21 +03:00
3958e9f156 Web: Client: Fixed FilesFilter 2023-07-24 17:50:40 +03:00
92a54c1951 Web: Client: Files: Restored mobile main button for frame mode after bad merge 2023-07-24 15:48:04 +03:00
5a893a8a0a Web: Files: Public-room fixed access for users with authorization, refactoring 2023-07-24 14:41:26 +03:00
55b6297928 Web: Components: Fix scroll when file element is not visible 2023-07-24 13:40:56 +02:00
9c1b938703 Web: Components: Fix scroll when file element is not visible 2023-07-24 12:28:55 +02:00
997ce4945c Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge 2023-07-21 16:52:02 +03:00
545bacfaf0 Merge branch 'develop' into fix-conflicts-merge
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-21 16:51:49 +03:00
Viktor Fomin
461112a7f3 Client: Profile: fix warning 2023-07-21 12:38:57 +03:00
e88d23cf50 Web: InvitePanel: Deleted useless ref code. 2023-07-21 12:15:01 +03:00
5bb6c6a8f4 Web: Fixed display of files loading during operations on it. 2023-07-21 11:14:18 +03:00
760b1ee6d2 Web: Components: Fix getting scroll element 2023-07-20 21:59:22 +02:00