mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
|
|
60e7c125ad
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:55:35 +04:00 |
|
|
|
1e615924ae
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:36:25 +04:00 |
|
Akmal Isomadinov
|
7051e55778
|
Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/DocSpace into feature/copy-paste-hotkeys
|
2023-09-08 15:28:00 +05:00 |
|
Akmal Isomadinov
|
15673efae5
|
Web:MediaViewer Added hot keys
|
2023-09-08 15:27:43 +05:00 |
|
|
|
5a76bd2bcf
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-08 12:05:20 +04:00 |
|
|
|
c5731bd8a8
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-08 11:28:42 +04:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Akmal Isomadinov
|
8dca5302af
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-07 18:46:47 +05:00 |
|
|
|
8ac6241c7e
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 17:13:02 +04:00 |
|
|
|
bf7e88da34
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 15:40:14 +03:00 |
|
Viktor Fomin
|
a99b036e87
|
Common: Article: fix
|
2023-09-07 12:57:22 +03:00 |
|
|
|
ed855b941f
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-07 11:07:00 +04:00 |
|
|
|
2b40130bce
|
Merge branch 'develop' into bugfix/backup
|
2023-09-06 10:51:25 +03:00 |
|
Akmal Isomadinov
|
6f8f34468c
|
Web: Updated tooltip
|
2023-09-05 14:14:37 +05:00 |
|
|
|
dc4b0275ec
|
Web: Added redirect only for rooms on error.
|
2023-09-05 10:38:00 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
83bc2edd02
|
Web: bump version to v1.1.3
|
2023-09-04 17:43:24 +04:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
613938b819
|
Web: Added Zoom login button, translates and icons
|
2023-09-04 16:06:55 +03:00 |
|
|
|
e9fcf067ee
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
|
2023-09-04 12:16:13 +03:00 |
|
Viktor Fomin
|
3f63a0b27c
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-02 01:07:54 +03: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 |
|
|
|
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 |
|
|
|
a952793dcb
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 17:03:04 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
b0cbe39aa6
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-01 16:47:52 +03:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02: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 |
|
|
|
c5b03c8aeb
|
Web: Login: Added captcha.
|
2023-08-31 15:39:57 +03:00 |
|
|
|
2f179bec9c
|
Web: SSO: Fix logout redirect
|
2023-08-31 14:33:29 +04:00 |
|
|
|
24278a2d6b
|
Web: Client: Setting: added new description of settings, fixed styles
|
2023-08-31 12:37:29 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
gazizova-vlada
|
566a5ce893
|
Web:Add link.
|
2023-08-30 18:34:47 +03:00 |
|
|
|
f2b1099d93
|
Web: Client: Common: remove manual rtl switching
|
2023-08-30 16:02:16 +02:00 |
|
|
|
2ced4328df
|
Web: updated react-i18next to v13
|
2023-08-30 15:08:56 +04:00 |
|
gazizova-vlada
|
9c9b43c51e
|
Web:Common:Fix.
|
2023-08-30 13:47:55 +03:00 |
|
gazizova-vlada
|
432429e0d6
|
Web:Rename LoginSettings in BruteForceProtection.
|
2023-08-30 12:13:05 +03:00 |
|
|
|
5e79ebe967
|
Added new language (ar-SA)
|
2023-08-30 12:03:34 +04:00 |
|
|
|
0242879692
|
Web:Common:Navigation: hide toggle button, when info panel is opened
|
2023-08-29 17:27:08 +03:00 |
|
|
|
1bad02933e
|
Fix bug 63802 - Settings: Deactivate: Removed unnecessary requests.
|
2023-08-29 17:13:05 +03:00 |
|
Subhonbek
|
2883754ca7
|
Update section-body.js
|
2023-08-29 13:11:58 +03:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
Subhonbek
|
7f3d66d7ea
|
web common fix srcroll padding
|
2023-08-29 12:36:35 +03:00 |
|
gazizova-vlada
|
2a171a0b5b
|
Web:Common:Fixed the lack of displaying an error when trying to login when all attempts have ended and there is a blocking.
|
2023-08-29 08:01:22 +03:00 |
|
Viktor Fomin
|
dec3a79423
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-08-29 06:31:34 +03:00 |
|
Viktor Fomin
|
1904e3bc43
|
Fix Bug 63467: auth via Microsoft is not available
|
2023-08-29 06:26:37 +03:00 |
|
|
|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
|
|
f956edb4d7
|
Web: Common: fix contextmenu offset on tablet and mobile screen sizes
|
2023-08-28 11:10:00 +02:00 |
|
