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

10647 Commits

Author SHA1 Message Date
pavelbannov
4ff65e2394 fix csp 2023-08-15 16:47:33 +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 Golubev
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
Anton Sukhorukov
1286039f65 fix Bug 62347 - Settings:Branding. 2023-08-07 13:34:29 +03:00
Maria-Sukhova
3afe88fbe2 added translations ja 2023-08-04 18:17:58 +03:00
Maria-Sukhova
34bdc3431c added translations 2023-08-04 17:53:20 +03:00
Maria-Sukhova
2b2c9b0c25 added translations 2023-08-04 17:07:12 +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
pavelbannov
0f5554e3ef fix bug 63525 2023-08-03 16:53:35 +03:00
Pavel Bannov
06777b395a
Merge pull request #1600 from ONLYOFFICE/feature/api-descriptions 
Feature/api descriptions
 2023-08-02 08:09:52 -07:00
Sergey Linnik
df20e9e624 api: fix documentation 2023-08-01 11:53:00 +03:00
Sergey Linnik
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
 2023-08-01 11:39:57 +03:00
Andrey Savihin
a508c7002a fix Bug 63492 - Welcome letter markup 2023-07-31 23:53:12 +03:00
Andrey Savihin
343c3f766c fix Bug 63409 - Welcome letter markup 2023-07-26 11:53:24 +03:00
Andrey Savihin
f135f37e06 fix Bug 63409 - Welcome letter markup 2023-07-24 21:29:56 +03:00
pavelbannov
06bf62f3c3 Smtp: fixed delete smtp method 2023-07-24 18:10:07 +03:00
Andrey Savihin
ee7461718d fix Bug 63381 - letter "Discover business subscription" for saas only 2023-07-19 17:37:52 +03:00
Maria-Sukhova
9b32618dd2 added translations 2023-07-14 16:01:54 +03:00
Maria-Sukhova
057bccb801 added translations 2023-07-13 18:20:52 +03:00
Ilya Oleshko
dc59259fd0 Revert "added translations" 
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.

# Conflicts:
#	build/install/OneClickInstall/install-Docker.sh
#	build/install/win/DocSpace.aip
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
 2023-07-13 13:02:08 +03:00
Maria-Sukhova
694bae6d1b added translations 2023-07-12 18:20:42 +03:00
pavelbannov
63b3bfbbfb Security: restricted access for csp 2023-07-12 17:18:20 +03:00
pavelbannov
d15f704b06 Security: added CspDto 2023-07-12 17:16:39 +03:00
Maria-Sukhova
812010a8af added translations 2023-07-11 18:22:23 +03:00
Ilya Oleshko
097b89b42f Merge branch 'release/v1.1.0' into feature/csp 2023-07-11 16:30:42 +03:00
pavelbannov
b3afd051af Csp: lua script, CspSettingsHelper, portalrename, dns change, domains array 2023-07-11 16:21:48 +03:00
Maria-Sukhova
3e18110da9 added translations 2023-07-10 18:16:31 +03:00
Maria-Sukhova
cb805f59c1 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-07 14:32:02 +03:00
Maria-Sukhova
62e6431605 added translations 2023-07-07 14:31:42 +03:00
pavelbannov
173e9473a6 Settings: added apiDocsLink 2023-07-07 11:53:23 +03:00
Maria-Sukhova
f8acd8f647 added translations 2023-07-06 16:36:28 +03:00
Maria-Sukhova
cbf7971cd3 added translations 2023-07-05 17:22:56 +03:00
Alexey Safronov
4d0c17d396
Merge pull request #1507 from ONLYOFFICE/feature/tenantcookie 
Feature/tenantcookie
 2023-07-05 06:53:01 +04:00
Maria-Sukhova
a6954a3764 added translations 2023-07-04 18:07:50 +03:00
Andrey Savihin
fcf354663b ASC.Web.Api: added CookieSettingsEnabled property to SettingsDto 2023-07-04 15:12:48 +03:00
Andrey Savihin
23ebc88350
Merge pull request #1508 from ONLYOFFICE/feature/session-auth-cookies 
Feature/session auth cookies
 2023-07-04 14:41:26 +03:00
Andrey Savihin
157605bc0b ASC.Web.Api: Authentication: Setting cookies based on the session parameter 2023-07-04 14:21:19 +03:00
Alexey Safronov
506544ea7c Merge branch 'release/v1.1.0' into feature/tenantcookie 2023-07-04 13:12:09 +04:00
Maria-Sukhova
3c9a253639 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-03 17:19:35 +03:00
Maria-Sukhova
725310d472 added translations 2023-07-03 17:18:59 +03:00
Alexey Safronov
045259a9f2
Merge pull request #1499 from ONLYOFFICE/feature/docker-dev 
Add docker runtime build images for develop
 2023-07-03 14:13:33 +04:00
Alexey Safronov
4305f16845 Build: Renamed profiles 2023-07-03 12:49:16 +04:00
Andrey Savihin
c97c1784f5 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-03 11:30:39 +03:00
Alexey Safronov
6921f945bc Build: Refactoring publish with profiles 2023-07-03 12:28:03 +04:00
Alexey Safronov
ed13a667b3 Publish: Added publish profiles for ASC.Web.Api (fix error NETSDK1152) 2023-07-03 00:55:01 +04:00
Alexey Safronov
2c540aed25 Publish: Added publish profiles for Unix 2023-07-03 00:53:29 +04:00
Ilya Oleshko
9b36fe282b Server: Added publish profiles for "ASC.People", "ASC.Web.Studio" 2023-07-02 14:54:56 +03:00
Ilya Oleshko
ed2a2ea9ec Server: Added publish profiles for "ASC.Files", "ASC.People", "ASC.Data.Backup", "ASC.Files.Service", "ASC.Notify", "ASC.Studio.Notify", "ASC.Web.Api", "ASC.Web.Studio", "ASC.Data.Backup.BackgroundTasks", "ASC.ClearEvents", "ASC.ApiSystem", "ASC.Web.HealthChecks.UI" 2023-07-02 12:51:28 +03:00
pavelbannov
0ff6e98473 TenantCookieSettings: lifetime is now 1440 by default. added "default" property 2023-06-30 19:07:18 +03:00
Maria-Sukhova
641164ecc2 added translations 2023-06-30 18:24:35 +03:00