Commit Graph

33193 Commits

Author SHA1 Message Date
f5cb9d9e21 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
#	common/services/ASC.AuditTrail/AuditReportResource.de.resx
#	common/services/ASC.AuditTrail/AuditReportResource.tr.resx
#	common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
2023-05-16 21:53:23 +03:00
b644a16e6f Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-16 18:44:02 +03:00
24081d3fdd added translations 2023-05-16 18:43:39 +03:00
29b6d20314
Bugfix/Fix services updates and optimize value retrieval in Docker OCI (#1418)
* Fix found orphan containers for this project warning

* Fix getting the machinekey

* Fix mysql data retrieval and substitution

* Fix services updates and optimize value retrieval

* Correct the help
2023-05-16 18:54:58 +05:00
Viktor Fomin
b1a2f4f17e Client: PortalSettings: Security: disable autofocus 2023-05-16 15:54:56 +03:00
Viktor Fomin
e3bc603f9d Fix Bug 62511: Uninformative error when session time expires 2023-05-16 15:53:40 +03:00
d145872b6e fixed portal request 2023-05-16 14:41:01 +03:00
1ecea2eaa8 fix bugs 62206 and 62204 2023-05-16 13:56:12 +03:00
0df3278f96 Fix UselessModuleTranslationKeysTest issue (key: MessageEmailActivationInstuctionsSentOnEmail) 2023-05-16 12:56:57 +04:00
dc805b8cbd Fix UselessModuleTranslationKeysTest issue (key: FreeStartupPlan) 2023-05-16 12:46:49 +04:00
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
fd45e59e51 transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6) 2023-05-15 20:49:23 +03:00
0338a029e8 Payments: fixed price for eu 2023-05-15 19:30:14 +03:00
ab3a38d8a0 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-15 17:53:27 +03:00
47a8b890da added translations 2023-05-15 17:52:57 +03:00
85205659ec Fix UselessModuleTranslationKeysTest issue (key: Copy) 2023-05-15 16:34:09 +04:00
3d40fdd1e5 Fix UselessModuleTranslationKeysTest issue (key: Rename) 2023-05-15 16:22:34 +04:00
7638c25dc0 Fix UselessModuleTranslationKeysTest issue (key: MoveTo) 2023-05-15 16:16:15 +04:00
356ba08300 Fix UselessModuleTranslationKeysTest issue (key: HideArticleMenu) 2023-05-15 16:00:14 +04:00
17888b7421 Fix UselessModuleTranslationKeysTest issue (key: CancelButton) 2023-05-15 15:58:01 +04:00
d817d931c1 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-15 15:35:19 +04:00
db1bcf5fc3 Fix UselessModuleTranslationKeysTest issue (key: Authorization) 2023-05-15 15:35:09 +04:00
078864ae24 Bug 62544 - Settings:Restore
"_chunkedUploadSessionHolder.MoveAsync" before "_factoryIndexer.IndexAsync"
2023-05-15 14:33:32 +03:00
9995eed7bf Fixed Bug 62573 - Files.Media. Fixed delete action 2023-05-15 14:18:42 +03:00
70d81fc799 Fix UselessModuleTranslationKeysTest issue (key: ApplyButton) 2023-05-15 14:42:46 +04:00
Viktor Fomin
85bce1ba4a Fix Bug 62593: The preview does not update when creating a custom color palette 2023-05-15 13:00:07 +03:00
8dc5459bbd Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-15 11:56:34 +03:00
3e5b90dcc1 added lo 2023-05-15 11:54:51 +03:00
a790c5f82f Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2023-05-15 11:52:17 +03:00
ca847b5671 Web:Client:Fixed the call to empty the trash using the Empty trash button in the main menu. 2023-05-15 11:50:44 +03:00
509fd357fa Fix WrongTranslationVariablesTest issues 2023-05-15 12:37:24 +04:00
4dc8faeea9 fixed RegionHelper 2023-05-13 21:37:04 +03:00
c65685b9ef fix 2023-05-12 22:53:18 +03:00
7ca54ad440 fix translate tests 2023-05-12 22:49:19 +03:00
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
163853751d fix 2023-05-12 20:47:41 +03:00
2586edcef3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-12 18:18:45 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
5a92a23467 remove crm resource 2023-05-12 17:36:47 +03:00
986545dc63 fix translate tests 2023-05-12 17:13:49 +03:00
dc0fc261e2 Fix Bug 62465 - Files.Trash. Ability to repeatedly press the Empty trash button. 2023-05-12 17:54:59 +04:00
cff0bed424 Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks 2023-05-12 14:56:36 +03:00
Viktor Fomin
d2aa4ca9b4 Fix Bug 62510: Unable to remove an invalid allowed IP address entry 2023-05-12 14:45:22 +03:00
Viktor Fomin
7b101f267b Client: PortalSettings: Security: fix 2023-05-12 14:26:14 +03:00
Elyor Djalilov
85fb071044 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-12 15:53:54 +05:00
Elyor Djalilov
8394dcd826 Client: PortalSettings: Security: fix display remove ip icon 2023-05-12 15:53:47 +05:00
d951cb538d Fix Bug 62165 - Desktop: Document opens in browser when saved and then opened in a new tab in desktop editor connected to DocSpace 2023-05-12 14:19:49 +04:00
91c0367a6d Fix ffmpeg installation for centos 9 2023-05-12 14:50:21 +05:00
9aa4d495fb Optimize getting values from the connection string in OCI 2023-05-12 14:49:59 +05:00
7a6b739421 Add an installation type parameter to the OCI 2023-05-12 14:48:18 +05:00