Commit Graph

7176 Commits

Author SHA1 Message Date
f4bc2d7575 Web: Files: fixed external link creation 2023-09-25 16:45:36 +03:00
95b095a386 Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization 2023-09-25 16:37:45 +03:00
67bd4632ad Web: Files: InviteInput: fixed search 2023-09-25 16:37:37 +03:00
796cbf3265 Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2023-09-25 15:58:53 +03:00
e59a189a84 Web: Files: MembersList: fixed mobile view 2023-09-25 15:38:22 +03:00
81612b04ef Web: Files: InfoPanel: fixed MembersList height 2023-09-25 15:00:05 +03:00
0db3fcc492 Web: Files: fixed MembersList height 2023-09-25 14:42:38 +03:00
ee809f380d Web: Files: fixed AddUsersPanel 2023-09-25 13:55:37 +03:00
b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
ec495bb299 Web: Files: MembersList: fixed styles 2023-09-22 17:57:04 +03:00
9d4cfd2b76 Web: Files: fixed members list 2023-09-22 17:54:56 +03:00
2c318669db Merge branch 'develop' into feature/creating-room-from-data 2023-09-22 18:39:56 +04:00
gazizova-vlada
0df4122c08 Web:Client:Change create to createRoom. 2023-09-22 17:31:45 +03:00
gazizova-vlada
3405508312 Web:Client:Refactoring. 2023-09-22 17:24:28 +03:00
gazizova-vlada
8703e6fc63 Web:Client:Fix bufferSelection. 2023-09-22 17:03:09 +03:00
573afcb448 Web: Files: PublicRoom: fixed external link actions 2023-09-22 16:46:14 +03:00
3c9dfca8c8 Web: Removed useless translations 2023-09-22 17:16:52 +04:00
a6d9ea95e9 Web: Removed useless key DNSSettingsTooltip 2023-09-22 17:13:57 +04:00
c91a2dfc36 Web: Added new SettingsDSConnect loader 2023-09-22 17:09:07 +04:00
gazizova-vlada
6a085a65c1 Web:Client:Add CatalogRoomsReactSvgUrl, translation. 2023-09-22 16:03:09 +03:00
gazizova-vlada
0c394ee1d2 Web:Client:Add Create room in getGroupContextOptions. 2023-09-22 15:55:27 +03:00
gazizova-vlada
9965519c89 Web:Client:Fixed function availability. 2023-09-22 15:48:09 +03:00
8371330d3c Web: Applied new design 2023-09-22 16:39:08 +04:00
269e76bbec Web: moved const creation into condition block 2023-09-22 16:26:51 +04:00
a4a89ed1c4 web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing 2023-09-22 16:25:41 +04:00
5dab788680 Web: Files: InfoPanel: added infinite-loader to members list 2023-09-22 15:10:48 +03:00
0a12dbef57 Web: Applied isDefault 2023-09-22 14:53:52 +04:00
gazizova-vlada
a1d2c7565b Web:Client:Add t, processCreatingRoomFromData, fix selections. 2023-09-22 13:35:43 +03:00
03f323660f Web: Changed button label 2023-09-21 19:58:05 +04:00
43a945939e Web: Fix translation key name (test issue) 2023-09-21 18:32:49 +04:00
556ce3de0a Web: Rename ids, param apiUrl to docServiceUrl and placeholder 2023-09-21 18:32:19 +04:00
gazizova-vlada
9a7e99a65f Wed:Client:Add create room for data selected. 2023-09-21 17:10:57 +03:00
6322290d58 Web: Added displaying loading process 2023-09-21 18:00:47 +04:00
b19ef29e25 Web: Fix onSubmit/onReset 2023-09-21 17:42:22 +04:00
35e40f617f Web: Added get DocumentService location settings 2023-09-21 17:28:15 +04:00
76252e407f Web: Hide DocumentServices for SAAS 2023-09-21 17:22:40 +04:00
44dbeb48cd Merge branch 'develop' into feature/document-service-location 2023-09-21 13:38:25 +04:00
Viktor Fomin
343dfaa20d Client: PortalSettings: integration: fix align 2023-09-21 12:03:24 +03:00
d1c3bb66bb Merge branch 'develop' into bugfix/fix-static-images 2023-09-20 19:53:29 +04:00
9c9f33cf12
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
2023-09-20 19:46:48 +04:00
Viktor Fomin
ad177109a6 Client: PublicRoom: RoomErrors: fix tKey 2023-09-20 17:36:17 +03:00
Viktor Fomin
b3023358f2 Client: delete useless 2023-09-20 17:35:56 +03:00
gazizova-vlada
69961e6900 Merge branch 'develop' into feature/reassign-data 2023-09-20 17:19:12 +03:00
f1da568484 Merge branch 'develop' into feature/split-invite 2023-09-20 18:16:31 +04:00
gazizova-vlada
a061d42f29 Web:Add dataReassignmentUrl. 2023-09-20 17:03:31 +03:00
Viktor Fomin
6cc1b68702 Client: Confirm: CreateUser: add redirect to room 2023-09-20 17:03:31 +03:00
gazizova-vlada
183b32c2aa Merge branch 'develop' into feature/reassign-data 2023-09-20 16:27:26 +03:00
gazizova-vlada
dd3e9d3363 Web:Client:Fix update accounts list after delete, delete dataReassignmentUrl. 2023-09-20 16:20:28 +03:00
bdabb35e55 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-20 15:03:02 +03:00
940338fd9d Web: Files: Leave-room: bugs fixed 2023-09-20 15:02:34 +03:00