Commit Graph

38303 Commits

Author SHA1 Message Date
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
fbb7727f58
Merge pull request #1748 from ONLYOFFICE/bugfix/thirdparty-signup
fixed registration through a third party
2023-09-15 15:50:17 +03:00
c221dd6a63
Merge pull request #1747 from ONLYOFFICE/bugfix/bug-64157
fix Bug 64157
2023-09-15 15:49:20 +03:00
bc4f464391 fixed registration through a third party 2023-09-15 15:19:27 +03:00
f125dbd89f Fix error when trying to update nodesource repository in OCI rpm 2023-09-15 16:47:00 +05:00
8d55703163 Merge branch 'hotfix/v1.1.3' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.3 2023-09-15 15:14:25 +04: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
af7caad3ea Bug 64105 - Files: Security. chunk uploader 2023-09-15 13:57:58 +03:00
43b1cc448c Web: fix twitter connect/login 2023-09-15 14:51:13 +04:00
Viktor Fomin
4d2f9327ab Merge branch 'develop' into feature/split-invite 2023-09-15 12:07:24 +03: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
80fb581d73 ASC.Data.Reassigns: ReassignProgressItem: throwing OperationCanceledException to OnCompleted 2023-09-15 12:02:53 +03:00
68f58e04fa
Merge pull request #1732 from ONLYOFFICE/feature/rtl-direction
feature/rtl-direction
2023-09-15 02:00:49 -07:00
Viktor Fomin
244c10bee1 Client: Confirm: add roomData 2023-09-15 11:55:13 +03:00
f8a51fc90b Add samesite variable predefinition 2023-09-15 13:49:35 +05:00
gazizova-vlada
cf930e37bc Web:Client:Fix id to userId. 2023-09-15 11:31:42 +03:00
291ae6da13 Csp: oform 2023-09-15 11:25:11 +03:00
c241a88322 Fix rpmlint and lintian errors 2023-09-15 13:14:46 +05: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
Viktor Fomin
028f04626f Login: fix double dialog 2023-09-15 00:09:31 +03:00