gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +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 |
|
|
|
1e0944b796
|
SSO: Changed authUrl
|
2023-08-31 14:32:47 +04:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
|
|
d39cb60c38
|
backend: added index (by creation_date column) to table notify_queue
|
2023-08-30 12:50:55 +03:00 |
|
|
|
d9aaa8b968
|
fix bug 63554
|
2023-08-29 13:34:48 +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 |
|
|
|
a1c4031cc6
|
upload backup: max size
|
2023-08-28 16:44:40 +03:00 |
|
|
|
c3a9966464
|
fix create backup hash
|
2023-08-28 14:57:16 +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 |
|
|
|
84ef14f857
|
Fix SSO errors redirect
|
2023-08-28 13:17:00 +04:00 |
|
|
|
ff66f27a1a
|
fix
|
2023-08-28 12:16:33 +03:00 |
|
|
|
16c5103d4f
|
fix
|
2023-08-28 12:03:33 +03:00 |
|
|
|
d475451899
|
fix backup upload
|
2023-08-28 12:01:36 +03:00 |
|
|
|
9c8ee8cbbc
|
fix backup upload
|
2023-08-28 11:49:25 +03:00 |
|
|
|
8487b627ee
|
ASC.Api.Core: chenged status for bruteforce or recaptcha exceptions
|
2023-08-25 17:57:42 +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 |
|
|
|
0d1b4adc4f
|
Update BackupFileUploadHandler.cs
|
2023-08-25 15:21:04 +03:00 |
|
|
|
a8c133f4ca
|
fix backup upload handler
|
2023-08-25 12:51:15 +03:00 |
|
|
|
a5721ed885
|
fix Bug 63765
|
2023-08-24 17:05:05 +03:00 |
|
|
|
4129592b31
|
fix Bug 60163
|
2023-08-23 19:38:12 +03:00 |
|
|
|
01237127a0
|
fix
|
2023-08-23 19:37:27 +03:00 |
|
|
|
80b9aafbb9
|
fix Bug 61152
|
2023-08-23 15:59:44 +03:00 |
|
|
|
56b7d2be44
|
fix Bug 63727 - Settings: Restore.
|
2023-08-22 14:00:04 +03:00 |
|
|
|
3a2b455019
|
Bug 63729 - Srv:Restore. restore from localfile
|
2023-08-22 13:15:34 +03:00 |
|
|
|
976f1fef8e
|
backend: change rate limiter alg from FixedWindow to SlidingWindow
|
2023-08-21 18:02:39 +03:00 |
|
|
|
27db5ac720
|
ASC.Web.Core: BruteForceLoginManager: added recaptcha check
|
2023-08-21 17:26:24 +03:00 |
|
|
|
8e982d5de5
|
fixed migration
|
2023-08-21 16:07:02 +03:00 |
|
|
|
41b0062c23
|
Merge branch 'develop' into feature/region-audit
|
2023-08-21 12:51:52 +03:00 |
|
|
|
f4c7567f47
|
added LastModified update when setting avatar
|
2023-08-21 11:45:01 +03:00 |
|
|
|
c64f6b0f66
|
Bug 63646
|
2023-08-21 10:53:33 +03:00 |
|
|
|
720a2817f8
|
fix bug 63687: added rate limiting for api
|
2023-08-18 18:47:23 +03:00 |
|
|
|
112d796b72
|
Csp: localhost
|
2023-08-18 17:01:32 +03:00 |
|
|
|
44a1021614
|
Migration: temporary removed postgre
|
2023-08-18 15:20:55 +03:00 |
|
|
|
416092f3f9
|
Quota: admin quota default price now is 15
|
2023-08-18 15:20:23 +03:00 |
|
|
|
88a06cc8da
|
Merge branch 'hotfix/v1.1.2' into feature/csp
|
2023-08-17 17:38:35 +03:00 |
|
|
|
58d328431a
|
Affiliates: fixed mapping
|
2023-08-17 17:27:50 +03:00 |
|
|
|
f9ff3fc378
|
Merge branch 'hotfix/v1.1.2' into feature/affiliate-link
|
2023-08-17 14:11:05 +03:00 |
|
|
|
d5db98fce2
|
Migrations: DbQuota: added new data
|
2023-08-17 12:28:19 +03:00 |
|
|
|
7c2c122a82
|
Migration: tenants_partners
|
2023-08-16 22:00:11 +03:00 |
|
|
|
629940db44
|
Merge branch 'hotfix/v1.1.2' into feature/affiliate-link
|
2023-08-16 19:44:24 +03:00 |
|
|
|
a822865b55
|
fix
|
2023-08-16 19:43:55 +03:00 |
|
|
|
d7897fa890
|
added DbTenantPartner
|
2023-08-16 18:42:56 +03:00 |
|
|
|
194d743e22
|
ASC.Core.Common: DbQuota: added new data
|
2023-08-16 17:36:34 +03:00 |
|
|
|
ceb2a85979
|
Merge pull request #1619 from ONLYOFFICE/bugfix/migration-namespace
fix migration namespace
|
2023-08-16 02:39:48 -07:00 |
|
|
|
95083786fe
|
Csp: fix domain and header
|
2023-08-15 17:11:41 +03:00 |
|
|
|
8bc220a926
|
revert
|
2023-08-15 16:36:23 +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 |
|
