4608c24c7a
Merge branch 'develop' into bugfix/fix-selection
2023-08-29 10:08:46 +03:00
06780b7f5d
Web: Client: Fixed after merge
2023-08-28 19:02:40 +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
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
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
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
265a1ae6ca
Fix errors when starting services via docker.profiles.yml
2023-08-28 14:43:59 +05:00
c56e220060
Web: Fix error report date
2023-08-28 13:24:34 +04:00
84ef14f857
Fix SSO errors redirect
2023-08-28 13:17:00 +04:00
35c6963f20
Update yarn.lock
2023-08-28 13:16:04 +04:00
af50fd07ed
Merge pull request #1645 from lemmav/feature/action-build
...
Add a tag action build
2023-08-28 10:20:52 +03:00
ea41ceefe6
bugfix whitelabel
2023-08-26 13:15:06 +03:00
6cdc975f60
Merge pull request #1664 from ONLYOFFICE/feature/adding-translations_client
...
Feature/adding translations client
2023-08-25 17:31:36 +03:00
c6c74e5948
edited API library
2023-08-25 17:25:26 +03:00
66081e8428
fixed warning
2023-08-25 17:20:17 +03:00
90fae33cb6
Csp: cdn for images
2023-08-25 16:35:41 +03:00
0865309ae8
Replace the nginx installation with an openresty installation ( #1663 )
2023-08-25 15:58:40 +03:00
4f456c7717
edited zh Settings.json
2023-08-25 15:49:11 +03:00
67287d712c
Add the ability to use an external services in OCI docker ( #1598 )
...
* Add the ability to use an external service elasticsearch
* Add the ability to use an external redis service
* Add the ability to use an external rabbitmq service
* Add the ability to use external mysql service
* Add network creation in OCI
* Implement non-use of host variable when connecting locally to containers
* Add missing environments in .yml files
* Add the ability to use external Docs service
* Fix problem of a given host as a container name
* Add the ability to configure the elasticsearch protocol
* Add comments to the .env file
* Fix migration-runner to mysql container connection error
* Implement Docs configuration via external URL
* Fix elasticsearch configuration parameter substitution
2023-08-25 15:39:26 +03:00
315d23e72f
Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2
2023-08-25 15:37:19 +03:00
9fd6b701d8
Csp: added ability to set default csp header.
2023-08-25 15:36:59 +03:00
87605003af
Remove overwriting of parameter values during reconfiguration ( #1590 )
2023-08-25 15:18:02 +03:00
Nasrullo Nurullaev
567fdbb60b
fix Bug 63367 - Add End User License Agreement ( #1651 )
...
* fix Bug 63367 - Add End User License Agreement
* Add Enterprise EULA
* Remove AI tag form LicenseDlg
2023-08-25 15:15:56 +03:00
DmitrySychugov
b6c7e5df06
Web: Client: Customization - fixed dropdown opening
2023-08-25 16:54:19 +05:00
DmitrySychugov
d3b0dddf0e
Web: Components: DropDown - fixed width calculation in dark theme
2023-08-25 16:53:58 +05:00
205cbda30d
edited BETA zh
2023-08-25 14:33:45 +03:00
022fc66f45
Merge pull request #1661 from ONLYOFFICE/bugfix/fix-nginx-config
...
Fix 404 error after reload page at trash
2023-08-25 13:58:31 +03:00
fbabdd080d
Merge pull request #1656 from ONLYOFFICE/bugfix/hide-mobilebutton
...
Web: Client: hidden the main button on mobile devices in the move to …
2023-08-25 13:51:25 +03:00
245325c563
added translations hy, ro
2023-08-25 13:40:27 +03:00
DmitrySychugov
afe2010b5d
Merge branch 'develop' into bugfix/hide-mobilebutton
2023-08-25 15:27:58 +05:00
DmitrySychugov
2955f1302e
Web: Client: hide the button on mobile devices if the file dialog is open
2023-08-25 15:27:15 +05:00
d8b09f4b3e
Delete v from image name
2023-08-25 13:21:40 +03:00
aec0398cc2
fix Bug 63816
2023-08-25 13:01:35 +03:00
712db4d4ee
edited Api -> API
2023-08-25 12:57:31 +03:00
e24755cbf4
added translations
2023-08-25 12:44:50 +03:00
3b0c46ab8c
Merge pull request #1658 from ONLYOFFICE/bugfix/filter-and-drop-down
...
Bugfix/filter and drop down
2023-08-25 12:33:15 +03:00
4b4b4f747f
added translations
2023-08-25 11:52:45 +03:00
gazizova-vlada
464f2a9642
Web:Client:Fixed content movement when scroll appears.
2023-08-25 11:23:42 +03:00
gazizova-vlada
aafa0059be
Web:Components:Fix click outside.
2023-08-25 11:19:50 +03:00
774ec39fbe
Web: Added highlighting the user role in the section header if one user is selected.
2023-08-25 11:18:31 +03:00
5aa6dcd2ee
Nginx: fix url shortener
2023-08-25 10:14:26 +03:00
Nasrullo Nurullaev
6b2d8a6b09
Add OpenResty to DocSpace as prerequisite ( #1659 )
...
* Add OpenResty to DocSpace as prerequisite
* Add OpenResty license
* Small fixes
2023-08-24 17:51:01 +03:00