|
|
ed8c4707a3
|
Merge branch 'feature/split-invite' of github.com:ONLYOFFICE/DocSpace into feature/split-invite
|
2023-09-14 17:38:05 +03:00 |
|
|
|
9bc66531ed
|
added room name and id to validation response
|
2023-09-14 17:37:52 +03:00 |
|
|
|
463c2d81a2
|
Api: sso. hideAuthPage
|
2023-09-13 12:21:09 +03:00 |
|
|
|
c3495ce668
|
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
|
2023-09-13 09:21:59 +03:00 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
e419f8ab40
|
added default link shortening
|
2023-09-12 14:54:59 +03:00 |
|
|
|
6cf75e74f8
|
Api: sso. HideAuthPage for anonymous
|
2023-09-11 17:55:57 +03:00 |
|
|
|
166208565f
|
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
|
2023-09-11 07:33:57 -07:00 |
|
|
|
c5ba70846c
|
added ar
|
2023-09-11 16:10:48 +03:00 |
|
|
|
7bd76d4782
|
added ar
|
2023-09-08 17:12:01 +03:00 |
|
|
|
2283184a61
|
removed Serializable attribute
|
2023-09-08 16:24:24 +03:00 |
|
|
|
07aa2dda5a
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-09-08 10:47:32 +03:00 |
|
|
|
675755aedd
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop
|
2023-09-08 09:46:59 +03:00 |
|
|
|
b5c2572dbc
|
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back
Feature/adding translations back
|
2023-09-07 03:24:27 -07:00 |
|
|
|
1b42dc1449
|
added translations
|
2023-09-07 12:15:31 +03:00 |
|
|
|
a3ab99638c
|
added pt-PT
|
2023-09-07 09:49:49 +03:00 |
|
|
|
cc10a5c221
|
added pt-PT
|
2023-09-06 17:28:27 +03:00 |
|
|
|
9a9dad8381
|
CSP: fixed room upload logo
|
2023-09-05 18:27:34 +03:00 |
|
|
|
2792df1a84
|
added pt-PT
|
2023-09-05 17:23:59 +03:00 |
|
|
|
98583fcbd1
|
added sk, ko
|
2023-09-05 15:36:38 +03:00 |
|
|
|
0369705ae3
|
Merge branch 'develop' into feature/accounts-optimization
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-05 11:22:06 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
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 |
|
|
|
2fd15b4108
|
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
|
2023-09-04 10:44:38 -07:00 |
|
|
|
715c21f090
|
added ko, sk
|
2023-09-04 18:21:40 +03:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
ba2233ca7a
|
common: move cspsettings from web.api to core.common project
|
2023-09-04 15:13:18 +03:00 |
|
|
|
f6ca59874d
|
zoom: add keys and add in AuthProviders
|
2023-09-04 14:46:48 +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 |
|
