|
|
f9635e0e42
|
Add dependency installation at domain check in OCI docker
|
2023-08-29 16:25:03 +05:00 |
|
|
|
3249e4a99f
|
Fix problem when pulling images in OCI docker
|
2023-08-29 16:24:36 +05:00 |
|
|
|
24d4e38494
|
fix
|
2023-08-29 14:14:06 +03:00 |
|
Eloncase
|
65fa314059
|
apisystem: zoom: handle store link
# Conflicts:
# common/services/ASC.ApiSystem/Controllers/ZoomController.cs
|
2023-08-29 14:04:40 +03:00 |
|
Eloncase
|
771b07b81b
|
ApiSystem: redirect if user and portal exists
# Conflicts:
# common/services/ASC.ApiSystem/Controllers/ZoomController.cs
|
2023-08-29 14:00:42 +03:00 |
|
Eloncase
|
86eaf2dd8d
|
FederatedLogin: zoom login provider
|
2023-08-29 14:00:31 +03:00 |
|
|
|
d9aaa8b968
|
fix bug 63554
|
2023-08-29 13:34:48 +03:00 |
|
|
|
df2b68c547
|
Web: PortalSettings: Fixed section header height.
|
2023-08-29 13:21:00 +03:00 |
|
Subhonbek
|
2883754ca7
|
Update section-body.js
|
2023-08-29 13:11:58 +03:00 |
|
|
|
f2613b3de0
|
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-29 13:05:47 +03:00 |
|
|
|
1aa6d79a6e
|
Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-29 12:48:38 +03:00 |
|
|
|
a299837f8f
|
fix backup for dropbox
|
2023-08-29 12:48:24 +03:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
Subhonbek
|
4770eea642
|
Merge branch 'feature/rtl-interface-client' of https://github.com/ONLYOFFICE/DocSpace into feature/rtl-interface-client
|
2023-08-29 12:36:38 +03:00 |
|
Subhonbek
|
7f3d66d7ea
|
web common fix srcroll padding
|
2023-08-29 12:36:35 +03:00 |
|
|
|
11714a30b1
|
Merge pull request #1673 from lemmav/hotfix/upstream.conf.template
Update map config
|
2023-08-29 12:33:08 +03:00 |
|
|
|
f342481f7d
|
Web: PortalSettings: Backup: Fixed comparison of accounts by title.
|
2023-08-29 12:24:09 +03:00 |
|
|
|
197cc8e1f0
|
Web: Client: fix wrong RTL styles
|
2023-08-29 11:22:44 +02:00 |
|
|
|
063673ac60
|
Fix redis value substitution error
|
2023-08-29 14:20:16 +05:00 |
|
Viktor Fomin
|
f1d8e004df
|
Client: Profile: fix warning
|
2023-08-29 12:11:44 +03:00 |
|
Viktor Fomin
|
d2b1769e6f
|
Web: add translates
|
2023-08-29 11:44:27 +03:00 |
|
|
|
b20a26f92a
|
Update map config
|
2023-08-29 11:26:01 +03:00 |
|
|
|
6020c1f74f
|
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-29 11:02:00 +03:00 |
|
|
|
f0e985703c
|
Correct the substitution of the Redis host and port
|
2023-08-29 12:27:12 +05:00 |
|
|
|
11b9e67c8c
|
Merge branch 'develop' into bugfix/people-selector
|
2023-08-29 10:10:02 +03:00 |
|
|
|
4608c24c7a
|
Merge branch 'develop' into bugfix/fix-selection
|
2023-08-29 10:08:46 +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
|
4751d2d559
|
Client: fix crash after invite users click
|
2023-08-29 07:13:22 +03:00 |
|
Viktor Fomin
|
1904e3bc43
|
Fix Bug 63467: auth via Microsoft is not available
|
2023-08-29 06:26:37 +03:00 |
|
|
|
06780b7f5d
|
Web: Client: Fixed after merge
|
2023-08-28 19:02:40 +03:00 |
|
SuhorukovAnton
|
ea72f288a2
|
Merge pull request #1670 from ONLYOFFICE/bugfix/63774-local-restore
Bugfix/63774 local restore
|
2023-08-28 18:57:14 +03:00 |
|
|
|
58087f2326
|
Merge branch 'hotfix/v1.1.2' into bugfix/63774-local-restore
|
2023-08-28 18:55:58 +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 |
|
|
|
15d345d428
|
fix oneDrive checkAccess
|
2023-08-28 17:37:05 +03:00 |
|
|
|
ae9331b689
|
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-28 16:45:19 +03:00 |
|
|
|
a1c4031cc6
|
upload backup: max size
|
2023-08-28 16:44:40 +03:00 |
|
|
|
3a2438dff3
|
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
|
2023-08-28 16:44:19 +03:00 |
|
|
|
89d8cd2221
|
Fix bug 63846 - Settings: Backup. Reset the selected folder when connecting to another account.
|
2023-08-28 16:43:39 +03:00 |
|
|
|
6fce6a8a3c
|
fix bug 63843
|
2023-08-28 16:43:16 +03:00 |
|
|
|
00ff80d6ee
|
Fix docker network creation and database connection problem
|
2023-08-28 17:44:18 +05:00 |
|
Nasrullo Nurullaev
|
1db37e457a
|
Add scripts for OpenResty configurations (#1666)
* Add scripts for configuring OpenResty
* Small fixes
|
2023-08-28 15:29:49 +03:00 |
|
Subhonbek
|
7089d330f8
|
Merge branch 'feature/rtl-interface-client' of https://github.com/ONLYOFFICE/DocSpace into feature/rtl-interface-client
|
2023-08-28 15:06:35 +03:00 |
|
|
|
c3a9966464
|
fix create backup hash
|
2023-08-28 14:57:16 +03:00 |
|
|
|
0354396787
|
Merge pull request #1636 from ONLYOFFICE/bugfix/fix-invite-panel-access-height
bugfix/fix-invite-panel-access-height
|
2023-08-28 14:11:02 +03:00 |
|
Viktor Fomin
|
0f47decca6
|
Fix Bug 63848: 2fa via sms is not available
|
2023-08-28 13:42:20 +03:00 |
|
|
|
be7034b296
|
added ar Common.json
|
2023-08-28 13:27:47 +03:00 |
|
|
|
dfc1bc9504
|
Web: PortalSettings: Restore: Added errors handler.
|
2023-08-28 13:26:30 +03:00 |
|
gazizova-vlada
|
e2a43db4ac
|
Merge branch 'feature/login-settings' of https://github.com/ONLYOFFICE/DocSpace into feature/login-settings
|
2023-08-28 12:54:50 +03:00 |
|
gazizova-vlada
|
9989a09df5
|
Web:Components:Add props withoutBackground.
|
2023-08-28 12:45:46 +03:00 |
|
gazizova-vlada
|
28a941f709
|
Web:Client:For mobiles with vertical orientation, a backdrop was added for the invite panel when opening rights.
|
2023-08-28 12:45:13 +03:00 |
|
