Commit Graph

34512 Commits

Author SHA1 Message Date
9c3a494b34 Merge branch 'feature/csp' of github.com:ONLYOFFICE/DocSpace into feature/csp 2023-08-09 16:20:14 +03:00
63eb78891d Web: Client: PortalSettings: Added CSP actions 2023-08-09 16:19:32 +03:00
dab87902a2 Merge branch 'hotfix/v1.1.2' into feature/csp 2023-08-09 15:49:58 +04:00
4d2bc180b0 Build: Docker: Dev: Added build/clean base images by default for windows 2023-08-09 12:51:06 +03:00
e65cf29ec3 Web: Client: PortalSettings: Added Beta badge 2023-08-09 11:37:45 +03:00
ceead77137 Build: Docker: Dev: Added build/clean base images by default 2023-08-09 12:29:39 +04:00
6bb5c28a9f Update yarn.lock 2023-08-09 12:28:12 +04:00
6acd16def9 Web: Accounts: Simplification of filter values ​​for standalone mode. 2023-08-09 10:54:55 +03:00
8cbe324d41
Fix the run of init containers in k8s (#1617) 2023-08-08 17:31:13 +03:00
96834370d8 RabbitMQ: update version. refactoring 2023-08-08 14:43:29 +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
c5d4272685 Revert "fixed rabbitmq connection leak"
This reverts commit 633ed22763.
2023-08-08 13:40:04 +03:00
0952050f8a
Merge pull request #1616 from lemmav/feature/healthcheck
Add healthcheck for onlyoffice-login and onlyoffice-doceditor
2023-08-08 11:59:07 +03:00
8592348fb4 Add healthcheck for onlyoffice-login and onlyoffice-doceditor 2023-08-08 11:40:33 +03:00
50e2b26f95 Bug 63557 - Settings: Restore. 2023-08-07 17:06:46 +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
b8d9c61bb3 Correct display of products in OCI scripts 2023-08-07 16:50:53 +05:00
00755737c7 Fix forum link in OCI scripts 2023-08-07 16:49:23 +05:00
Nasrullo Nurullaev
300b18bf85
Remove unnecessary custom actions in DocSpace EE (#1613) 2023-08-07 13:44:42 +03:00
1286039f65 fix Bug 62347 - Settings:Branding. 2023-08-07 13:34:29 +03:00
3afe88fbe2 added translations ja 2023-08-04 18:17:58 +03:00
34bdc3431c added translations 2023-08-04 17:53:20 +03:00
3172e6e100
Merge pull request #1612 from ONLYOFFICE/bugfix/63538
fix Bug 63538
2023-08-04 07:37:29 -07:00
c2e284f110 fix Bug 63538 2023-08-04 17:30:58 +03:00
2b2c9b0c25 added translations 2023-08-04 17:07:12 +03:00
Akmal Isomadinov
5f135c4ad2 Web:Fixed warning link preload 2023-08-04 17:59:39 +05:00
Akmal Isomadinov
bd5ce03c70 Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2 2023-08-04 17:18:51 +05:00
Akmal Isomadinov
6647a32201 Web:Client:Integration Fixed bug 63500 2023-08-04 17:18:27 +05:00
ca1445c4c9
Merge pull request #1605 from ONLYOFFICE/bugfix/bug-63501
Web:Fixed bug 63501
2023-08-04 15:50:02 +04:00
b90002c4fe Merge branch 'hotfix/v1.1.2' into bugfix/bug-63501 2023-08-04 15:33:46 +04:00
e4c3783317 fix Bug 63553 2023-08-04 14:24:43 +03:00
e43a37dde6 Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2 2023-08-04 14:14:10 +03:00
cfccb454a3 Web: Editor: Server: Added correct headers for each instance of axios client 2023-08-04 14:13:59 +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
Akmal Isomadinov
77b96e92c5 Web: Fixed the path to the CSS file 2023-08-04 15:25:28 +05:00
Nasrullo Nurullaev
0172bf2070
Update ConnectionDlg UI texts and bitmap (#1610) 2023-08-04 12:54:51 +03:00
68f304947d fix bug 63503 2023-08-04 11:30:19 +03:00
ce51ad4f9e Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/1.1.2 2023-08-04 09:44:33 +03:00
8ba1099358 Web: Optimize fonts import 2023-08-03 21:54:09 +04:00
f8c74d12bd added translations 2023-08-03 18:27:59 +03:00
Akmal Isomadinov
42eb301dbc Web: Removed old fonts 2023-08-03 19:47:52 +05:00
Akmal Isomadinov
ca33068d60 Web:Login Updated fonts in the template 2023-08-03 19:46:46 +05:00
Akmal Isomadinov
5440824b38 Web:Added new fonts open sans v35 2023-08-03 19:44:53 +05:00
Akmal Isomadinov
ba763e9673 Web:Config:Ngnix Updated location 2023-08-03 19:42:30 +05:00
0f5554e3ef fix bug 63525 2023-08-03 16:53:35 +03:00
Viktor Fomin
384cf0d8e1 Fix Bug 63460: The text in the logos from company name is shifted to the top left corner 2023-08-03 15:47:25 +03:00
2b28b6a33e bug 63454 : logging 2023-08-03 13:16:50 +03:00
Akmal Isomadinov
ec2e74fec5 Build: Dev: Added dos2unix for proxy container for Dockerfile.runtime 2023-08-03 14:39:37 +05:00
203d6d9aba Build: Dev: Added --build_proxy 2023-08-03 12:41:36 +04:00
ba65bed31c Merge branch 'hotfix/v1.1.2' into bugfix/bug-63501 2023-08-03 12:27:38 +04:00