Commit Graph

7405 Commits

Author SHA1 Message Date
47647180d1 Web: Files: hidden invited users from AddUsersPanel 2023-09-26 16:02:51 +03:00
006c552ae6 Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins 2023-09-26 14:40:33 +03:00
08e874bf15 Web: Files: MembersList: fixed scroll 2023-09-26 14:40:06 +03:00
gazizova-vlada
62aebcc672 Merge branch 'develop' into feature/creating-room-from-one-folder 2023-09-26 13:08:48 +03:00
8fcbd8fa9b Web: Files: fixed styles for expected users 2023-09-26 12:35:26 +03:00
bf6b30fb97 Web: Files: fixed warning 2023-09-26 12:30:02 +03:00
0ea8f36e4c Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization 2023-09-26 12:21:02 +03:00
2444f7c871 Web: Files: fixed double API request 2023-09-26 12:20:49 +03:00
ea3c18dcc7 Merge branch 'develop' into feature/room-share-optimization 2023-09-26 12:21:59 +04:00
88b283a28a Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys 2023-09-26 12:21:40 +04:00
fe51f00a4f Web: Files: fixed resendEmailInvitations 2023-09-25 17:07:25 +03:00
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
gazizova-vlada
62516a36bd Web:Client:Added that if a room is created from one folder, then only the contents of the folder are copied to the room, and not the folder itself. 2023-09-25 10:58:18 +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
fd383577a0 Merge branch 'develop' into feature/web-plugins 2023-09-25 08:53:04 +03:00
70be87e984 Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-22 17:27:38 +02: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
f5e0260558 Web: Client: fix closing dropdown after click on input
(bug 60655 does not appear)
2023-09-22 13:44:02 +02: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
24a5bd2402 Web: Client: show inviteInputPanel after 2nd typed symbol 2023-09-21 13:35:04 +02:00
70b5c6e111 MErge branch 'develop' into feature/web-plugins 2023-09-21 14:30:04 +03: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
2176cb65bb Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-20 18:12:26 +02:00
abad1401f3 Web: Client: block showing addEmailPanel before searching 2023-09-20 18:00:12 +02: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
1abbdd85f3 Web: Client: fix usersList blinking when type 3rd symbol 2023-09-20 16:27:55 +02: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
b25b39da14 Merge branch 'develop' into feature/web-plugins 2023-09-20 14:55:39 +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
Viktor Fomin
915eef9d91 Client: add translate 2023-09-20 11:30:28 +03:00
Viktor Fomin
73118da8f2 Merge branch 'develop' into feature/split-invite 2023-09-20 10:52:17 +03:00
Viktor Fomin
2085f23a60 Client: PortalSettings: SSO: fix infinite loader 2023-09-20 10:48:24 +03:00
4f136e61b4 Web: Increased height of Textarea 2023-09-19 20:09:04 +04:00
2e7fc53dcf Web: Fix crash on thirdpartiesLogo undefined 2023-09-19 19:22:07 +04:00
516f034571
Merge pull request #1752 from ONLYOFFICE/bugfix/fix-submenu-line
bugfix/fix-submenu-line
2023-09-19 15:46:18 +04:00
6766a28c19 Merge branch 'develop' into bugfix/fix-root-selection 2023-09-19 15:40:49 +04:00
Viktor Fomin
19e1b51887 Merge branch 'develop' into feature/split-invite 2023-09-19 14:04:18 +03:00
bf48ce5393 Merge branch 'develop' into feature/web-plugins 2023-09-19 14:02:42 +03:00
mushka-n
b5d23aaf62 added request canceling 2023-09-19 13:27:22 +03:00
fb6d0b06a9 edited 'Move to Trash' description 2023-09-19 12:29:04 +03:00
4e38a5a987 Web: Applied new formGallery config 2023-09-19 13:12:40 +04:00
1c1ab16fa8 Web: Removed useless import 2023-09-19 13:12:02 +04:00
2b41d47d0f Web:Client: delete console log 2023-09-19 11:42:28 +03:00
238b86bce5 Web: Files: fixed wsModifyFolderUpdate 2023-09-19 11:31:25 +03:00
849ca096fd Web:Client: fix click on back 2023-09-19 11:17:49 +03:00
gazizova-vlada
b45e59a1df Merge branch 'feature/reassign-data' of https://github.com/ONLYOFFICE/DocSpace into feature/reassign-data 2023-09-19 11:06:20 +03:00
gazizova-vlada
b30b20f733 Web:Client:Print error to toastr. 2023-09-19 11:06:03 +03:00
gazizova-vlada
dd35e54ca6 Web:Delete scale props in Submenu, BottomLine width to 100%. 2023-09-19 10:55:35 +03:00
89e590e30f Web: Files: hidden context menu option to mute/unmute if user is not in the room 2023-09-19 10:52:47 +03:00
2cbd3e05b8 Web:Client:Article: remove selection after change root folder 2023-09-19 10:49:20 +03:00
ca76336fc3 Merge branch 'develop' into feature/leave-room 2023-09-19 10:44:07 +03:00
922a90e963 Web: Files: fixed leave-room context option 2023-09-19 10:41:16 +03:00
ec89036236 Web:Client:Plugins: add check for props 2023-09-19 10:29:52 +03:00
Vlada Gazizova
3471bbf09f
Merge branch 'develop' into feature/reassign-data 2023-09-19 09:54:45 +03:00
gazizova-vlada
600482c94d Web:Client:Fix. 2023-09-19 09:53:26 +03:00
gazizova-vlada
191a781225 Web:Fix. 2023-09-19 09:49:39 +03:00
d364748d84 Merge branch 'develop' into feature/web-plugins 2023-09-19 09:23:13 +03:00
8dc0507a03 Web:Client:Plugins: fix client after change system plugin 2023-09-19 09:17:59 +03:00
gazizova-vlada
c34f60577d Web:Client:Add translation. 2023-09-19 09:08:14 +03:00
91ae0883e9 Web:Client:Plugins: fix plugin dialog 2023-09-19 08:58:48 +03:00
gazizova-vlada
21bd975674 Web:Client:Fix styles. 2023-09-19 08:58:04 +03:00
gazizova-vlada
4d1fc192d0 Web:Client:Change translation Account list to List accounts. 2023-09-18 18:43:18 +03:00
gazizova-vlada
be2861f110 Web:Client:Add timerId. 2023-09-18 18:38:34 +03:00
gazizova-vlada
f8d623d3ef Web:Add dataReassignmentUrl. 2023-09-18 18:17:02 +03:00
mushka-n
9d418bff4b fixed selector closing logic 2023-09-18 17:59:44 +03:00
mushka-n
b6ca0ad826 fix rtl 2023-09-18 17:40:26 +03:00
mushka-n
0956461ec5 revert to old selector behaviour 2023-09-18 17:30:55 +03:00
mushka-n
e51e712fb4 added DOCXF-only filtering to selector 2023-09-18 17:15:27 +03:00
mushka-n
d98680b350 moved translations and updated selector 2023-09-18 17:10:16 +03:00
mushka-n
87ac20c1fd added SubmitToGalleryTile save on close 2023-09-18 17:09:34 +03:00
mushka-n
2fd546f697 fixed formData naming 2023-09-18 17:09:14 +03:00
gazizova-vlada
34a7c068a7 Web:Client:Add onStartAgain, onTerminate. 2023-09-18 16:55:03 +03:00
mushka-n
aa074fab8e update on file selector closing behaviour 2023-09-18 16:01:12 +03:00
mushka-n
6459d37c5b cleaned up logs 2023-09-18 15:49:43 +03:00
mushka-n
f28c328c54 Merge branch 'feature/submit-to-form-gallery' of https://github.com/ONLYOFFICE/DocSpace into feature/submit-to-form-gallery 2023-09-18 15:37:45 +03:00
mushka-n
d3bebdbda0 update dark theme 2023-09-18 15:37:40 +03:00
74f9ea784b Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 16:31:27 +04:00
9fe5fdd464
Merge pull request #1744 from ONLYOFFICE/feature/mobile-sdk
Feature/mobile sdk
2023-09-18 16:22:45 +04:00
mushka-n
068f89ce2c fix onClose error 2 2023-09-18 15:21:59 +03:00
mushka-n
903cb39e3f fix onClose error 2023-09-18 15:18:07 +03:00
250c88725f Web: Client: add missing whitespace between sdk description and link 2023-09-18 14:12:12 +02:00
mushka-n
ae899c0264 fix submit to gallery context option 2023-09-18 15:09:43 +03:00
1e020592e2 Web: Client: fix space in sdk tab 2023-09-18 14:01:38 +02:00
Viktor Fomin
e49f0818c5 Merge branch 'develop' into feature/split-invite 2023-09-18 14:46:10 +03:00
Viktor Fomin
7250c923d0 Client: PortalSettings: SSO: fix style 2023-09-18 14:31:23 +03:00
2f1f2ef4fa Web: Client: fix long text in theme edit button 2023-09-18 13:28:32 +02:00
mushka-n
4a6b1b7f0d tarnslations + link popup unblock 2023-09-18 14:28:25 +03:00
33091f9304 Web: Client: fix long text in copy button 2023-09-18 12:55:29 +02:00
84f77d3b3d Web: Files: removed someDialogIsOpen 2023-09-18 13:52:51 +03:00
e0b4b232df Web: Files: Leave-room: fixed translations 2023-09-18 13:50:33 +03:00
95424d49f9 Web: Added ru translations + autofixes 2023-09-18 14:17:00 +04:00
mushka-n
da7aec7445 Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 13:06:39 +03:00
0deac4bf00 Merge branch 'develop' into feature/mobile-sdk 2023-09-18 13:45:20 +04:00
Viktor Fomin
571b94f842 Merge branch 'develop' into feature/split-invite 2023-09-18 12:35:23 +03:00
Viktor Fomin
e1961f4724 Client: SSO: fix 2023-09-18 11:58:33 +03:00
Viktor Fomin
4dd844c0a0 Merge branch 'develop' into bugfix/sso 2023-09-15 18:59:12 +03:00
Viktor Fomin
ec0cb7c58c Merge branch 'develop' into feature/split-invite 2023-09-15 18:59:00 +03:00
00c3d8a367 Merge branch 'develop' into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-15 18:46:34 +03:00
mushka-n
c717324d37 applied submit method (temp cors-anywhere) 2023-09-15 18:42:24 +03:00
4c633854ed Web: Files: fixed change owner crash 2023-09-15 18:39:29 +03:00
Viktor Fomin
1997b6d24a Client: Confirm: CreateUser: get Sign up label 2023-09-15 18:33:29 +03:00
715615813e Merge branch 'develop' into feature/rooms-icons 2023-09-15 19:17:24 +04:00
Viktor Fomin
157a3083c0 Client: Confirm: CreateUser: hide social sign up if email from link 2023-09-15 18:14:33 +03:00
Viktor Fomin
71e5179f64 Merge branch 'develop' into feature/split-invite 2023-09-15 18:12:30 +03:00
c32c2b61f7 Web: Files: fixed translations 2023-09-15 17:56:05 +03:00
4ad47b9797 Merge branch 'develop' into feature/cron 2023-09-15 18:15:37 +04:00
a5662b7cdd Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/public/locales/en/Files.json
2023-09-15 16:54:26 +03:00
Viktor Fomin
21b43b6be1 Client: Confirm: CreateUser: hide social sign up if email from link 2023-09-15 16:22:57 +03:00
fbb7727f58
Merge pull request #1748 from ONLYOFFICE/bugfix/thirdparty-signup
fixed registration through a third party
2023-09-15 15:50:17 +03:00
bc4f464391 fixed registration through a third party 2023-09-15 15:19:27 +03:00
ec7c2f3001 Fix Bug 64152 - Settings: Customizations. After renaming the portal in DocSpace Renaming, the old name remains. 2023-09-15 15:14:07 +04:00
d25e3e3d42 Web:Client:Plugins: add context menu item for all plugin actions, add opportunity change UNKNOWN file type and file.svg icon 2023-09-15 13:55:41 +03:00
43b1cc448c Web: fix twitter connect/login 2023-09-15 14:51:13 +04:00
Viktor Fomin
d4f3ebb987 Client: Confirm: CreateUser: fix ssoExist, add text via SSO 2023-09-15 12:07:13 +03:00
Viktor Fomin
6229112857 Client: add translate 2023-09-15 12:06:39 +03:00
Viktor Fomin
244c10bee1 Client: Confirm: add roomData 2023-09-15 11:55:13 +03:00
gazizova-vlada
cf930e37bc Web:Client:Fix id to userId. 2023-09-15 11:31:42 +03:00
gazizova-vlada
e205fb5d78 Web:Client:Add onTerminate. 2023-09-15 10:32:12 +03:00
mushka-n
cf735a6fbe Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-15 00:43:58 +03:00
mushka-n
6b9e132ae4 upload form update (need to test, no cors) 2023-09-15 00:39:43 +03:00
e26bcc6ee2 Web:Client:Plugins: update list of plugins at portal settings, change settings plugin dialog 2023-09-14 18:27:37 +03:00
f5bb35760d Web: Hide "Sign out" for Zoom App 2023-09-14 17:31:06 +04:00
gazizova-vlada
34468a9ba4 Web:Client:Fix. 2023-09-14 15:50:23 +03:00
gazizova-vlada
4f517b5210 Web:Client:Fixed blinking of the loaded icon. 2023-09-14 15:44:53 +03:00
Viktor Fomin
d363808d00 Merge branch 'develop' into feature/split-invite 2023-09-14 12:24:28 +03:00
f477080db2 Merge branch 'develop' into bugfix/trash-navigation 2023-09-14 13:20:17 +04:00
f05e79347f Web: Files: fixed Save translation key 2023-09-14 12:09:03 +03:00
23202b8477 web: Files: fixed translation key 2023-09-14 12:04:19 +03:00
c84eb55ff1 Merge branch 'develop' into feature/add-new-link-dialog 2023-09-14 11:12:17 +03:00
5ca957789e Web: Client: hide built-in toast container in textarea to avoid double toast on the page 2023-09-13 18:17:24 +02:00
850675cd8e Web: Client: fix code text color 2023-09-13 17:56:15 +02:00
gazizova-vlada
a1f43d3cf0 Web:Client:Refactoring. 2023-09-13 18:40:05 +03:00
gazizova-vlada
dff945deaf Web:Client:Rename setDataReassignmentDeleteAdministrator in setIsDeleteUserReassignmentYourself. 2023-09-13 18:39:18 +03:00
3ceccbba29 Web:Client:Home: delete plugins list 2023-09-13 16:29:14 +03:00
Viktor Fomin
3fb330f495 Client: Confirm: CreateUser: use invitation type text 2023-09-13 15:57:14 +03:00
09b012d4e9 Web:Client: fix blinking trash navigation 2023-09-13 15:52:04 +03:00
Viktor Fomin
671ed5dadf Client: delete useless translations 2023-09-13 15:51:15 +03:00
Viktor Fomin
8cfa307c05 Client: add translations 2023-09-13 15:50:35 +03:00
ad93ede662 Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
2023-09-13 15:44:16 +03:00
7a075a1351 Web: Client: add successful copy toast 2023-09-13 14:43:48 +02:00
3eddd09e9c Merge branch 'develop' into feature/mobile-sdk 2023-09-13 14:18:29 +02:00
122fd60af1 Merge branch 'develop' into feature/rooms-icons 2023-09-13 15:13:23 +04:00
Akmal Isomadinov
bbd40500c9 Merge branch 'develop' into feature/cron 2023-09-13 16:11:13 +05:00
f32ed269ed Merge branch 'develop' into bugfix/date-picker 2023-09-13 15:00:12 +04:00
307d0eb4d1 Merge branch 'develop' into feature/mobile-sdk
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
2023-09-13 12:30:44 +02:00
482f4abf15 Web: Client: fix showing broken preview on small tablet screens 2023-09-13 12:28:20 +02:00
Viktor Fomin
ded758ed37 Merge branch 'develop' into bugfix/sso 2023-09-13 12:41:13 +03:00
6e0618fd0e Merge branch 'develop' into bugfix/trash-navigation 2023-09-13 11:50:55 +03:00