IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,051 Commits 38 Branches 22 Tags 359 MiB
183b32c2aa
Commit Graph

1262 Commits

Author SHA1 Message Date
pavelbannov
c20e935cec Api: FormGalleryDto. Mapping 2023-09-19 16:38:44 +03:00
Alexey Safronov
f15953bbe4 Revert "oform" config + added "upload" section 2023-09-19 13:43:26 +04:00
Alexey Safronov
4b368870ab Added new FormGallery config (+ extended API settings) 2023-09-19 13:11:34 +04:00
pavelbannov
463c2d81a2 Api: sso. hideAuthPage 2023-09-13 12:21:09 +03:00
Alexey Bannov
c3495ce668
Merge pull request #1737 from ONLYOFFICE/feature/short-links 
Feature/short links
 2023-09-13 09:21:59 +03:00
Alexey Safronov
5be921b540 Merge branch 'develop' into feature/back-ar 2023-09-12 18:01:15 +04:00
MaksimChegulov
e419f8ab40 added default link shortening 2023-09-12 14:54:59 +03:00
pavelbannov
6cf75e74f8 Api: sso. HideAuthPage for anonymous 2023-09-11 17:55:57 +03:00
Maria-Sukhova
7bd76d4782 added ar 2023-09-08 17:12:01 +03:00
Sergey Linnik
675755aedd Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop 2023-09-08 09:46:59 +03:00
Pavel Bannov
b5c2572dbc
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back 
Feature/adding translations back
 2023-09-07 03:24:27 -07:00
Maria-Sukhova
cc10a5c221 added pt-PT 2023-09-06 17:28:27 +03:00
pavelbannov
9a9dad8381 CSP: fixed room upload logo 2023-09-05 18:27:34 +03:00
Alexey Safronov
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
pavelbannov
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
Andrei Panov
ba2233ca7a common: move cspsettings from web.api to core.common project 2023-09-04 15:13:18 +03:00
gazizova-vlada
6de452efac Merge branch 'develop' into feature/login-settings 2023-09-01 16:56:55 +03:00
MaksimChegulov
4439425625 fix Bug 63942 2023-09-01 16:00:56 +03:00
pavelbannov
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
pavelbannov
9694959958 Csp: allow all for baseDomain 2023-08-31 18:19:06 +03:00
pavelbannov
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
Andrey Savihin
d6471d615e ASC.Web.Api: LoginSettings: fixed ArgumentOutOfRangeException: The absolute expiration value must be in the future 2023-08-30 19:46:20 +03:00
pavelbannov
7227d3bd9c Api: logout for sso 2023-08-30 19:19:18 +03:00
pavelbannov
d50f033882 Csp: save to redis for InterNetwork ip addresses 2023-08-30 13:46:06 +03:00
Alexey Bannov
eb640f8b56 fixed Bug 63510 2023-08-29 23:21:45 +03:00
pavelbannov
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
pavelbannov
90fae33cb6 Csp: cdn for images 2023-08-25 16:35:41 +03:00
pavelbannov
9fd6b701d8 Csp: added ability to set default csp header. 2023-08-25 15:36:59 +03:00
MaksimChegulov
aec0398cc2 fix Bug 63816 2023-08-25 13:01:35 +03:00
Anton Sukhorukov
1332f58b88 fix Bug 62347 and Bug 63716 - Settings:Branding. 2023-08-22 18:37:40 +03:00
Andrey Savihin
27db5ac720 ASC.Web.Core: BruteForceLoginManager: added recaptcha check 2023-08-21 17:26:24 +03:00
pavelbannov
112d796b72 Csp: localhost 2023-08-18 17:01:32 +03:00
Andrey Savihin
143f360b3f ASC.Web.Api: AuthenticationController: error message from resource file 2023-08-18 14:39:25 +03:00
pavelbannov
621bcb6bca Api: hidden methods 2023-08-18 14:33:48 +03:00
Ilya Oleshko
88a06cc8da Merge branch 'hotfix/v1.1.2' into feature/csp 2023-08-17 17:38:35 +03:00
pavelbannov
03de49bcf1 Csp: zendesk 2023-08-17 13:39:19 +03:00
pavelbannov
629940db44 Merge branch 'hotfix/v1.1.2' into feature/affiliate-link 2023-08-16 19:44:24 +03:00
pavelbannov
95083786fe Csp: fix domain and header 2023-08-15 17:11:41 +03:00
pavelbannov
f8770c467d Csp: fix for firebase 2023-08-15 16:54:33 +03:00
pavelbannov
4ff65e2394 fix csp 2023-08-15 16:47:33 +03:00
pavelbannov
f2916f2121 bug 63601 2023-08-14 21:03:39 +03:00
Anton Sukhorukov
c2e14efedc audit geolocation 2023-08-10 17:28:35 +03:00
Anton Sukhorukov
9b74f49359 refactoring 2023-08-10 16:19:48 +03:00
pavelbannov
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
Alexey Safronov
b666fe0c57 Merge branch 'develop' into feature/deep-link 2023-08-07 12:36:27 +04:00
Alexey Safronov
638807a0e0 Merge branch 'develop' into feature/deep-link 2023-08-04 19:01:14 +04:00
pavelbannov
e80fd2a74e fixed ArgumentOutOfRangeException 2023-08-04 17:42:14 +03:00
Natalia
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
Natalia
6c1edce8c6 added api docs 1.1.1 2023-08-03 16:50:57 +03:00