Skip to content

Conversation

AAAMON
Copy link
Contributor

@AAAMON AAAMON commented Dec 6, 2024

This fixed the issue described here: #1702.

@AAAMON AAAMON added Deployment Containers, automation scripts, etc. OnlyOffice Relates to OnlyOffice integration in CryptPad labels Dec 6, 2024
@davidbenque davidbenque changed the base branch from main to staging December 6, 2024 11:00
@davidbenque davidbenque added this to the Spring Release (2025.3.0) milestone Dec 6, 2024
@@ -720,12 +725,11 @@ define([
});

assert(function (cb, msg) { // FIXME possibly superseded by more advanced CSP tests?
var url = `/common/onlyoffice/dist/${OOCurrentVersion.currentVersion}/web-apps/apps/spreadsheeteditor/main/index.html`;
msg.appendChild(CSP_WARNING(url));
msg.appendChild(CSP_WARNING(sheetURL));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is no if (ooEnabled) { needed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed! Typo from when i reverted the Prettier formatting.

Copy link
Contributor

@wginolas wginolas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, and another thing. How did the changes to docker-compose.yml and .github/ISSUE_TEMPLATE/bug_resolution.yml make it into your PR? Can you remove these changes from you PR?

@mathilde-cryptpad
Copy link
Contributor

Ah, and another thing. How did the changes to docker-compose.yml and .github/ISSUE_TEMPLATE/bug_resolution.yml make it into your PR? Can you remove these changes from you PR?

Screenshot 2024-12-11 at 10 28 46

It's because the PR wasn't created from staging but main, it indeed needs to be rebased.

@AAAMON AAAMON force-pushed the fix-onlyoffice-checkup branch from 4ce0191 to b5176fa Compare December 12, 2024 07:42
@AAAMON
Copy link
Contributor Author

AAAMON commented Dec 12, 2024

Fixed

@wginolas
Copy link
Contributor

I also tested the fix and found no problems.

@davidbenque davidbenque removed Deployment Containers, automation scripts, etc. OnlyOffice Relates to OnlyOffice integration in CryptPad labels Mar 12, 2025
@yflory yflory merged commit 6219ce7 into staging Mar 17, 2025
@yflory yflory deleted the fix-onlyoffice-checkup branch March 26, 2025 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants