Commit Graph

7176 Commits

Author SHA1 Message Date
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
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
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
gazizova-vlada
c34f60577d Web:Client:Add translation. 2023-09-19 09:08:14 +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
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
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