Commit Graph

7166 Commits

Author SHA1 Message Date
Viktor Fomin
782f064149 Fix Bug 64324: Special characters are not allowed to be used in the password 2023-09-26 17:53:22 +03:00
88b283a28a Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys 2023-09-26 12:21:40 +04: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
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
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
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
Viktor Fomin
c5b982d239 Client: PortalSettings: Integration: fix style 2023-09-20 14:48:38 +03:00
3d20697ac0 Web: Translation: Fix UTC key duplication + sorting 2023-09-20 15:36:34 +04:00
cc966ed58a Web: Restored usefull code 2023-09-20 14:57:41 +04:00
292f92e818 Web:Client: fix import images from image-helpers 2023-09-20 13:42:43 +03:00
52460ab0b1 Web: Files: removed useless someDialogIsOpen 2023-09-20 13:29:59 +03:00
925451db9d Web: Files: fixed leave-room for user 2023-09-20 13:29:18 +03:00
913f409f03 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room 2023-09-20 13:10:26 +03:00
06846b07d2 Web: Files: Leave-room: fix 2023-09-20 13:10:15 +03:00
3a1bf92291 Merge branch 'develop' into feature/leave-room 2023-09-20 13:20:56 +04:00
Viktor Fomin
67864b8eec Client: PortalSettings: Integration: add free/paid consumers 2023-09-20 11:31:32 +03:00