Commit Graph

6362 Commits

Author SHA1 Message Date
gazizova-vlada
5cde1519c6 Web:Client:Add styles, validation. 2023-08-30 12:11:33 +03:00
gazizova-vlada
fc6f692efa Merge branch 'develop' into feature/login-settings 2023-08-16 15:14:14 +03:00
gazizova-vlada
c47f5fd87e Web:Client:Add Brute Force Protection setting. 2023-08-16 09:36:21 +03:00
c5b87c457e Web: Files: fixed appearance preview 2023-08-15 10:33:46 +03:00
9b87f39811 Web: Files: fixed selection-area select 2023-08-14 13:55:14 +03:00
d8ac8e9b34 Web: Files: InfoPanel: fixed translation 2023-08-14 13:54:35 +03:00
640b7ebbe9 Web: Files: fixed hotkeys scroll 2023-08-14 13:54:01 +03:00
432caec093
Merge pull request #1620 from ONLYOFFICE/bugfix/fix-invite-panel
bugfix/fix-invite-panel
2023-08-11 18:15:32 +04:00
ed5f438954 Web: Client: Filter: Restored after merge 2023-08-11 16:11:27 +03:00
e531654c54 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.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/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
a100fdc3e1 Fix bug 63618 - Payments: Payer. The payment page skips the payer's email address if a different case is used. 2023-08-10 15:37:13 +03:00
gazizova-vlada
11bbb0b479 Web:Client:Fix footer height. 2023-08-09 16:57:10 +03:00
6acd16def9 Web: Accounts: Simplification of filter values ​​for standalone mode. 2023-08-09 10:54:55 +03:00
2a7b044307
Merge hotfix/1.1.2 into hotfix/v1.1.2
Merge hotfix/1.1.2 into hotfix/v1.1.2
2023-08-07 15:42:56 +03:00
d51185872b Web: fix empty Rooms loading 2023-08-07 12:23:02 +04:00
Akmal Isomadinov
6647a32201 Web:Client:Integration Fixed bug 63500 2023-08-04 17:18:27 +05:00
ce51ad4f9e Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/1.1.2 2023-08-04 09:44:33 +03:00
f8c74d12bd added translations 2023-08-03 18:27:59 +03:00
Viktor Fomin
384cf0d8e1 Fix Bug 63460: The text in the logos from company name is shifted to the top left corner 2023-08-03 15:47:25 +03:00
81907e9247 Web: Client: Fix getting wrong scroll elements 2023-08-02 17:56:06 +02:00
49c32801d7 Fix bug 63472 - Removed badges "paid" from accounts and invite panel for standalone mode. 2023-08-02 17:08:48 +03:00
Viktor Fomin
3380e0a73c Fix Bug 63514: Error "/api/2.0/settings/ssov2 500" when navigating to another page 2023-08-02 15:03:30 +03: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