Commit Graph

37506 Commits

Author SHA1 Message Date
5730a393f0 Merge branch 'develop' into feature/management 2023-09-04 12:23:29 +04:00
21f8f74f47 BabelEdit: Fix open projects (client, common) 2023-09-04 12:09:46 +04:00
913a8178d8
Merge pull request #1655 from ONLYOFFICE/bugfix/fix-selection
Web:Client:FilesActionsStore: clear selection after open new folder
2023-09-04 10:17:49 +03:00
969ddbe162 Web: fix Invalid Host header on WP:DevServer with domain 2023-09-04 11:13:04 +04:00
0d870f8e77
Merge pull request #1641 from ONLYOFFICE/bugfix/calendar-ui
bugfix/calendar-ui
2023-09-02 00:08:24 +04:00
cf528ac224
Merge pull request #1657 from ONLYOFFICE/bugfix/people-selector
bugfix/people selector
2023-09-01 23:59:11 +04:00
f8ddf23e16
Merge pull request #1660 from ONLYOFFICE/bugfix/dropdown-edits
Bugfix/dropdown edits
2023-09-01 23:58:27 +04:00
fa368adb4d
Merge pull request #1667 from ONLYOFFICE/bugfix/contextmenu-offset
bugfix/contextmenu-offset
2023-09-01 23:57:37 +04:00
001d2d313f
Merge pull request #1677 from ONLYOFFICE/bugfix/info-panel-toggle-button
Web:Common:Navigation: hide toggle button, when info panel is opened
2023-09-01 23:10:17 +04:00
12a1ee2912
Merge pull request #1671 from ONLYOFFICE/bugfix/crash-after-invite-users
Client: fix crash after invite users click
2023-09-01 23:08:23 +04:00
b7e8a3b581
Merge pull request #1678 from ONLYOFFICE/bugfix/fixed-tile-view
Bugfix/fixed tile view
2023-09-01 23:05:20 +04:00
1561f12249 Merge branch 'develop' into bugfix/fixed-tile-view 2023-09-01 22:59:09 +04:00
fd62487769
Merge pull request #1681 from ONLYOFFICE/bugfix/create-room-margin
Web: Client: fixed margin for create room dialog
2023-09-01 22:54:01 +04:00
e2aa305fd1
Merge pull request #1684 from ONLYOFFICE/bugfix/mobile-button-blinking
Web: Components: MainButtonMobile - fixed blinking when opening
2023-09-01 22:52:58 +04:00
4681517910 Merge branch 'develop' into bugfix/mobile-button-blinking 2023-09-01 22:49:29 +04:00
4b28a96581
Merge pull request #1690 from ONLYOFFICE/feature/rtl-interface-client
Feature/rtl interface client
2023-09-01 22:47:28 +04:00
fa345cded2 Update yarn.lock 2023-09-01 22:23:35 +04:00
c33f5b3a57 Update frontend.macos.code-workspace 2023-09-01 22:22:22 +04:00
d77e8a1771 Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
#	packages/common/store/SettingsStore.js
2023-09-01 16:42:08 +02:00
Viktor Fomin
88a2dda00a Merge branch 'develop' into bugfix/crash-after-invite-users 2023-09-01 17:37:15 +03:00
474ba313df
Merge pull request #1687 from ONLYOFFICE/feature/login-settings
Feature/login settings
2023-09-01 17:58:09 +04:00
gazizova-vlada
6de452efac Merge branch 'develop' into feature/login-settings 2023-09-01 16:56:55 +03:00
gazizova-vlada
8386bcaf0a Merge branch 'feature/login-settings' of https://github.com/ONLYOFFICE/DocSpace into feature/login-settings 2023-09-01 16:47:06 +03:00
gazizova-vlada
319a4a1a45 Web:Client:Add isSaving. 2023-09-01 16:47:02 +03:00
efdd42f8f6 Merge branch 'develop' into feature/rtl-interface-client 2023-09-01 15:30:48 +02:00
1b4b9df8f0 Web: Login: Added reset on every error. 2023-09-01 16:26:53 +03:00
695a56bdee Web: Client: fix rtl styles in theme preview 2023-09-01 15:14:41 +02:00
4a669a0137 ASC.Api.Core: EmailValidationKeyModelHelper: added parameters for confirm type Auth 2023-09-01 16:09:53 +03:00
gazizova-vlada
4e9f1ee5ee Web:Client:Delete isInitLoading. 2023-09-01 15:55:09 +03:00
gazizova-vlada
4159c3fcfe Web:Client:Moved isInit after all requests. 2023-09-01 15:36:09 +03:00
gazizova-vlada
7250bcdc87 Web:Client:Refactoring. 2023-09-01 15:35:26 +03:00
3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	yarn.lock
2023-09-01 15:33:39 +03:00
9b0925b9ec Web: Client: fix missing interfaceDirection in payments saas 2023-09-01 14:25:17 +02:00
dee941b640 fix Bug 63936 - Fix the document server configuration issue with openresty installed 2023-09-01 16:58:20 +05:00
gazizova-vlada
29e85205bb Web:Client:Refactoring. 2023-09-01 14:42:18 +03:00
54b6742b6b
Merge pull request #1686 from ONLYOFFICE/feature/external-IP-services
Add external services connection in deb/rpm packages
2023-09-01 15:55:49 +05:00
c4b4039129 Web: Client: fix send again button position in rtl 2023-09-01 12:52:44 +02:00
ddbec6b8a9 Roll back unnecessary cosmetic changes 2023-09-01 15:52:20 +05:00
efde095892
Merge branch 'hotfix/v1.1.2' into feature/external-IP-services 2023-09-01 14:33:57 +04:00
Elbakyan Shirak
72e803eabb Fix some bugs 2023-09-01 14:28:44 +04:00
de693d8945 Fix the problem with substitution of special characters contained in the connection string 2023-09-01 15:28:22 +05:00
eda6b4d63f Updating the nodejs repository installation to an up-to-date version 2023-09-01 14:27:41 +05:00
c4d2048e3a Web: Login: Added error handler. 2023-09-01 10:28:52 +03:00
Elbakyan Shirak
96a5dafea5 Add external services connection, resolve conflict 2023-09-01 11:08:43 +04:00
a85a721a3b ASC.Web.Core: BruteForceLoginManager: fixed recaptcha check 2023-08-31 18:41:06 +03:00
9694959958 Csp: allow all for baseDomain 2023-08-31 18:19:06 +03:00
fdc48e7b91 Update yarn.lock 2023-08-31 19:10:04 +04:00
64ad22f7a9 Update yarn.lock 2023-08-31 19:08:48 +04:00
7195afc984 Web: Client: remove useless code 2023-08-31 16:22:34 +02:00
d65abdf452 Web: Login: Conditions have been added. 2023-08-31 16:34:28 +03:00