|
d864448da5
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
|
2023-09-04 23:01:50 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
4439425625
|
fix Bug 63942
|
2023-09-01 16:00:56 +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 |
|
|
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 |
|
|
b94486328f
|
Sso: settings.
|
2023-08-31 11:17:35 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +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 |
|
|
ddb2320ac8
|
fix Bug 63893
|
2023-08-30 18:54:46 +03:00 |
|
|
d50f033882
|
Csp: save to redis for InterNetwork ip addresses
|
2023-08-30 13:46:06 +03:00 |
|
|
eb640f8b56
|
fixed Bug 63510
|
2023-08-29 23:21:45 +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 |
|
|
ea41ceefe6
|
bugfix whitelabel
|
2023-08-26 13:15:06 +03:00 |
|
|
90fae33cb6
|
Csp: cdn for images
|
2023-08-25 16:35:41 +03:00 |
|
|
9fd6b701d8
|
Csp: added ability to set default csp header.
|
2023-08-25 15:36:59 +03:00 |
|
|
aec0398cc2
|
fix Bug 63816
|
2023-08-25 13:01:35 +03:00 |
|
|
99715992ad
|
fix Bug 63776
|
2023-08-24 12:36:50 +03:00 |
|
|
1332f58b88
|
fix Bug 62347 and Bug 63716 - Settings:Branding.
|
2023-08-22 18:37:40 +03:00 |
|
|
27db5ac720
|
ASC.Web.Core: BruteForceLoginManager: added recaptcha check
|
2023-08-21 17:26:24 +03:00 |
|
|
41b0062c23
|
Merge branch 'develop' into feature/region-audit
|
2023-08-21 12:51:52 +03:00 |
|
|
112d796b72
|
Csp: localhost
|
2023-08-18 17:01:32 +03:00 |
|
|
143f360b3f
|
ASC.Web.Api: AuthenticationController: error message from resource file
|
2023-08-18 14:39:25 +03:00 |
|
|
621bcb6bca
|
Api: hidden methods
|
2023-08-18 14:33:48 +03:00 |
|
|
88a06cc8da
|
Merge branch 'hotfix/v1.1.2' into feature/csp
|
2023-08-17 17:38:35 +03:00 |
|
|
03de49bcf1
|
Csp: zendesk
|
2023-08-17 13:39:19 +03:00 |
|
|
629940db44
|
Merge branch 'hotfix/v1.1.2' into feature/affiliate-link
|
2023-08-16 19:44:24 +03:00 |
|
|
95083786fe
|
Csp: fix domain and header
|
2023-08-15 17:11:41 +03:00 |
|
|
f8770c467d
|
Csp: fix for firebase
|
2023-08-15 16:54:33 +03:00 |
|
|
4ff65e2394
|
fix csp
|
2023-08-15 16:47:33 +03:00 |
|
|
f2916f2121
|
bug 63601
|
2023-08-14 21:03:39 +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 |
|
|
32fc662a85
|
backend: updated some dll
|
2023-08-10 19:16:25 +03:00 |
|
|
c2e14efedc
|
audit geolocation
|
2023-08-10 17:28:35 +03:00 |
|
|
9b74f49359
|
refactoring
|
2023-08-10 16:19:48 +03:00 |
|
|
e427f70709
|
backend: updated some dll
|
2023-08-08 19:43:14 +03:00 |
|
|
bddbcd02c4
|
Merge branch 'hotfix/v1.1.2' into feature/csp
# Conflicts:
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2023-08-08 14:13:52 +03:00 |
|
|
2a7b044307
|
Merge hotfix/1.1.2 into hotfix/v1.1.2
Merge hotfix/1.1.2 into hotfix/v1.1.2
|
2023-08-07 15:42:56 +03:00 |
|
|
1286039f65
|
fix Bug 62347 - Settings:Branding.
|
2023-08-07 13:34:29 +03:00 |
|
|
b666fe0c57
|
Merge branch 'develop' into feature/deep-link
|
2023-08-07 12:36:27 +04:00 |
|
|
3afe88fbe2
|
added translations ja
|
2023-08-04 18:17:58 +03:00 |
|
|
638807a0e0
|
Merge branch 'develop' into feature/deep-link
|
2023-08-04 19:01:14 +04:00 |
|
|
34bdc3431c
|
added translations
|
2023-08-04 17:53:20 +03:00 |
|
|
7438caeead
|
HealthCheck: ApiCache doesn't start
|
2023-08-04 17:48:52 +03:00 |
|
|
e80fd2a74e
|
fixed ArgumentOutOfRangeException
|
2023-08-04 17:42:14 +03:00 |
|
|
2b2c9b0c25
|
added translations
|
2023-08-04 17:07:12 +03:00 |
|
|
c889ebed66
|
added api docs 1.1.1
# Conflicts:
# common/ASC.Core.Common/EF/Context/UrlShortenerFakeDbContext.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-08-04 13:59:06 +03:00 |
|
|
0f5554e3ef
|
fix bug 63525
|
2023-08-03 16:53:35 +03:00 |
|