Commit Graph

38330 Commits

Author SHA1 Message Date
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
4c75d2f7e4
Merge pull request #1750 from ONLYOFFICE/bugfix/sso-layout
bugfix/sso-layout
2023-09-18 15:44:47 +04: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
21b335f656 fixed after merge 2023-09-18 13:32:55 +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
63a09852d6 fixed change owner 2023-09-18 12:56:24 +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
fe5de27885
Merge pull request #1741 from ONLYOFFICE/bugfix/sso
Bugfix/sso
2023-09-18 13:32:22 +04:00
Viktor Fomin
dea30be358 Merge branch 'develop' into bugfix/sso 2023-09-18 12:05:30 +03:00
35de42a262
Merge pull request #1739 from ONLYOFFICE/feature/version-error
feature/version-error
2023-09-18 13:01:24 +04:00
Viktor Fomin
e1961f4724 Client: SSO: fix 2023-09-18 11:58:33 +03:00
mushka-n
2fa0561238 fixed submit method (no cors-anywhere) 2023-09-18 11:46:37 +03:00
Viktor Fomin
b94492b795 Components: TextInput: fix disabled style 2023-09-18 11:45:09 +03:00
d89137eced ASC.People: ReassignController: returning progress in a terminate method 2023-09-18 11:31:29 +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
5c8c820b5e
Merge pull request #1730 from ONLYOFFICE/feature/rooms-icons
Feature/rooms icons
2023-09-15 19:37:14 +04:00
Viktor Fomin
5fc2677a2a Common: MoreLoginModal: get Sign up label 2023-09-15 18:33:43 +03:00
Viktor Fomin
1997b6d24a Client: Confirm: CreateUser: get Sign up label 2023-09-15 18:33:29 +03:00
Viktor Fomin
93581e8e63 Common: Utils: fix getProviderTranslation 2023-09-15 18:32:32 +03:00
Viktor Fomin
15e58aa3c7 Web: add translates 2023-09-15 18:32:09 +03:00
715615813e Merge branch 'develop' into feature/rooms-icons 2023-09-15 19:17:24 +04:00
c42072eb9e Update yarn.lock 2023-09-15 19:16:55 +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
b9cb9507ec fixed change owner 2023-09-15 18:07:19 +03:00
44bea3a535
Merge pull request #1635 from ONLYOFFICE/feature/cron
Feature/cron
2023-09-15 18:56:34 +04:00
c32c2b61f7 Web: Files: fixed translations 2023-09-15 17:56:05 +03:00
6580423517 Web: Components: Added margin to Cron story 2023-09-15 18:54:43 +04:00
7dd4deb420 Web: Components: Renamed folder Cron to cron (storybook sorting issue) 2023-09-15 18:52:01 +04:00
9b5572552e Web: Fix ru translations 2023-09-15 18:28:31 +04:00
4ad47b9797 Merge branch 'develop' into feature/cron 2023-09-15 18:15:37 +04:00
6d47d23531
Merge pull request #1672 from ONLYOFFICE/bugfix/trash-navigation
Bugfix/trash navigation
2023-09-15 18:13:53 +04:00
05b8dc19b5 Merge branch 'develop' into bugfix/trash-navigation 2023-09-15 18:02:34 +04:00
479d6f7952 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room 2023-09-15 16:54:31 +03: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
16e46e47fa Files: owner becomes administrator after "change owner" operation 2023-09-15 16:41:53 +03:00
eba752f2cd Fix domain overwrite on docspace update in OCI docker 2023-09-15 18:38:46 +05:00
Viktor Fomin
21b43b6be1 Client: Confirm: CreateUser: hide social sign up if email from link 2023-09-15 16:22:57 +03:00