Commit Graph

37269 Commits

Author SHA1 Message Date
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
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
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
c5b03c8aeb Web: Login: Added captcha. 2023-08-31 15:39:57 +03:00
500807c510 added ar 2023-08-31 15:24:21 +03:00
2f179bec9c Web: SSO: Fix logout redirect 2023-08-31 14:33:29 +04:00
1e0944b796 SSO: Changed authUrl 2023-08-31 14:32:47 +04:00
7fc8855825 Web: SSO: fix display validateCerts error 2023-08-31 13:55:51 +04:00
b94486328f Sso: settings. 2023-08-31 11:17:35 +03:00
gazizova-vlada
c7c058052f Web:Client:Fix. 2023-08-31 09:57:44 +03:00
gazizova-vlada
629b42161c Merge branch 'develop' into feature/login-settings 2023-08-31 09:57:26 +03:00
gazizova-vlada
fdd4196381 Web:Client:Removed the ability to store zero in BlockingTime. 2023-08-31 09:07:47 +03:00
336b635240 Merge branch 'feature/login-settings' of https://github.com/ONLYOFFICE/DocSpace into feature/login-settings 2023-08-30 19:46:59 +03:00
d6471d615e ASC.Web.Api: LoginSettings: fixed ArgumentOutOfRangeException: The absolute expiration value must be in the future 2023-08-30 19:46:20 +03:00
9489927284 Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2 2023-08-30 19:19:28 +03:00
7227d3bd9c Api: logout for sso 2023-08-30 19:19:18 +03:00
gazizova-vlada
4b6c84ce94 Web:Client:Add EnterTime. 2023-08-30 19:05:54 +03:00
gazizova-vlada
f0c4f73626 Web:Client:Add class. 2023-08-30 19:05:32 +03:00
ddb2320ac8 fix Bug 63893 2023-08-30 18:54:46 +03:00
1bbce8326d Web: Client: set user's locale in getting document dates 2023-08-30 17:43:45 +02:00
gazizova-vlada
c17b595f57 Web:Client:Refactoring errorNode. 2023-08-30 18:37:41 +03:00
gazizova-vlada
566a5ce893 Web:Add link. 2023-08-30 18:34:47 +03:00
42ac885b05
Merge pull request #1682 from ONLYOFFICE/feature/adding_translations
Feature/adding translations
2023-08-30 19:25:19 +04:00