|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
|
27ae382c4e
|
Changed path to buildtools
|
2023-10-03 11:45:09 +04:00 |
|
|
|
d0add3dbb1
|
Changed paths (to publish/web)
|
2023-10-02 16:49:15 +04:00 |
|
|
|
f188adc1e5
|
Web: Client: Fixed appsettings path
|
2023-10-02 14:16:20 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
Viktor Fomin
|
5f57f796e1
|
Login: Invalid: fix tKey
|
2023-09-20 17:36:37 +03:00 |
|
Viktor Fomin
|
c0d87940f0
|
Web: move ExpiredLink translate to Common
|
2023-09-20 17:35:38 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
43b1cc448c
|
Web: fix twitter connect/login
|
2023-09-15 14:51:13 +04:00 |
|
Viktor Fomin
|
028f04626f
|
Login: fix double dialog
|
2023-09-15 00:09:31 +03:00 |
|
Viktor Fomin
|
0ae358fd79
|
Login: add type
|
2023-09-13 13:08:44 +03:00 |
|
Viktor Fomin
|
083a87e243
|
Login: get hideAuthPage from server
|
2023-09-13 13:08:26 +03:00 |
|
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
Viktor Fomin
|
52e43ee18a
|
Login: add support auto sso redirect
|
2023-09-09 16:17:54 +03:00 |
|
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
|
|
db3f75c78b
|
added translations
|
2023-09-07 18:40:17 +03:00 |
|
Viktor Fomin
|
35a4aa0acb
|
Merge branch 'develop' into bugfix/login-page
|
2023-09-07 13:32:17 +03:00 |
|
|
|
c29f577df6
|
Merge branch 'develop' into feature/adding-new_ru
|
2023-09-07 14:10:20 +04: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 |
|
|
|
f406e9eb3d
|
Web: Added check for userAgent of Zoom app
|
2023-09-04 15:40:03 +04:00 |
|
|
|
c1bf6bf308
|
added new texts ru
|
2023-09-04 12:57:19 +03:00 |
|
Viktor Fomin
|
f2d5d32268
|
Merge branch 'develop' into bugfix/login-page
|
2023-09-02 15:48:01 +03: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 |
|
|
|
1b4b9df8f0
|
Web: Login: Added reset on every error.
|
2023-09-01 16:26:53 +03:00 |
|
|
|
c4d2048e3a
|
Web: Login: Added error handler.
|
2023-09-01 10:28:52 +03: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 |
|
|
|
7f05c219a9
|
added ar
|
2023-08-30 18:20:54 +03:00 |
|
|
|
1cae812f55
|
Web: Client: Login: add setting direction depending on the current language
|
2023-08-30 11:56:42 +02:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
|
|
3e0910df17
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-29 09:56:40 +03:00 |
|
Viktor Fomin
|
b61dda5c21
|
Merge branch 'develop' into bugfix/login-page
|
2023-08-29 06:35:05 +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 |
|
Viktor Fomin
|
50ba2358c5
|
Login: fix color scheme
|
2023-08-28 09:49:20 +03:00 |
|
|
|
800fe94f27
|
added ar Editor.json, Login.json, Errors.json
|
2023-08-25 15:43:21 +03:00 |
|
Viktor Fomin
|
24ecb849f9
|
Login: fix tKey
|
2023-08-25 12:44:34 +03:00 |
|
Viktor Fomin
|
65c14775f5
|
Login: fix forgot password dialog
|
2023-08-25 12:44:05 +03:00 |
|
Viktor Fomin
|
573b8f96a4
|
Fix Bug 57787: The Interface theme option from the portal is not taken when changing the theme in Desktop Editors
|
2023-08-23 15:44:39 +03:00 |
|
|
|
f182292c44
|
Fixed Bug 63728 - Settings: Customization. Xss script inserted into the Welcome Page line breaks the authorization page.
|
2023-08-22 12:16:14 +03:00 |
|
|
|
f4c9338c07
|
Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link.
|
2023-08-21 13:30:49 +03:00 |
|
|
|
e19f2f4c12
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/login/src/client/components/ClientApp.tsx
|
2023-08-14 15:34:02 +02:00 |
|
|
|
734d42c55a
|
Web: Login: Add RTL to Login
|
2023-08-14 15:24:49 +02:00 |
|
|
|
0b6d17bd61
|
Web: Login: Add RTL to global styles
|
2023-08-14 13:58:17 +02:00 |
|
|
|
f752752102
|
Web: Login: Put interface direction to theme and place globalstyles inside ThemeProvider
|
2023-08-14 13:57:39 +02:00 |
|
|
|
078073d0df
|
Fix Bug 63407 - Accounts: Two-factor authentication: Authorization through social networks does not work when two-factor authentication is enabled
|
2023-08-14 12:46:35 +03:00 |
|
|
|
482c646440
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-14 11:08:45 +03:00 |
|
|
|
e531654c54
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-08-11 12:47:44 +03:00 |
|
