Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mozilla Branding Removal] First pass at removing Mozilla references, links, images, etc. #1298

Merged
merged 5 commits into from
Sep 9, 2024

Conversation

Exairnous
Copy link
Contributor

@Exairnous Exairnous commented Jul 30, 2024

Mozilla links and references have been either removed, updated, or replaced with placeholders. Placeholders are marked with (TBD) where possible.

The PROMOTION.md file has been rewritten to be generic and no longer conveys the automatic right to use promoted scenes in advertising.

The two images with Mozilla branding have been replaced with non-Mozilla counterparts.

More details can be found in the commit messages.

Additional Notes:
src/editor/nodes/TroikaTextNode.js should be checked to make sure it isn't a credit and should actually be removed.

links in .env files and habitat files are unchanged to ensure nothing breaks. The same for references to mozillareality

links in yarn-error.log are unchanged because I think they have a historical context. It's possible this whole file should be removed in the future, though.

The reference to Mozilla in src/ui/assets/sources/SketchfabSource.js I have deemed a credit and left unchanged. For reference, this what I left unchanged: label: "Mozilla Playground - by Tombolaso"

I have left these references unchanged as I believe they don't constitute branding:

test/fixtures/V3TestScene.spoke:                  "href": "https://hubs.mozilla.com/scenes/VfoICgK/too-late"
test/fixtures/V4TestScene.spoke                   "href": "https://hubs.mozilla.com"
test/fixtures/V6TestScene.spoke:                  "href": "https://hubs.mozilla.com"
test/fixtures/V7TestScene.spoke:                  "href": "https://hubs.mozilla.com"
test/fixtures/V8TestScene.spoke:                  "href": "https://hubs.mozilla.com"
test/integration/Editor.test.js:                  author: "mozillareality",
test/integration/snapshots/Editor.test.js.md:     author: 'mozillareality',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com/scenes/VfoICgK/too-late',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com',
test/integration/snapshots/Editor.test.js.md:     href: 'https://hubs.mozilla.com',

Update Mozilla links to the Hubs-Foundation versions, or to placeholders until suitable documents can be recreated.  Placeholders are marked with (TBD) where possible.
References to Mozilla's name are either removed or changed to refer to Hubs, its community, or the Hubs Foundation.

Note: links in .env files, GitHub workflows, and habitat files are unchanged to ensure nothing breaks.  The same for references to mozillareality.
Rewrite the PROMOTION.md file to be generic and applicable to all Hubs instances.
Removes the right for the owner of the instance to use the promoted scene in advertising without explicit consent.
The Mozilla logo is replaced with the Hubs duck logo with white horizontal text.
The Spoke logo is replaced with the Spoke icon with white horizontal text.
@Exairnous Exairnous marked this pull request as draft July 30, 2024 12:01
@Exairnous
Copy link
Contributor Author

Seems the workflows won't run properly until we get a docker registry in working order.

@Exairnous Exairnous marked this pull request as ready for review July 31, 2024 09:07
@Exairnous
Copy link
Contributor Author

@eyesnareinc I haven't been able to test this in hubs-compose (I can't get mine to work for some reason), but I have been able to run it locally and it does at least run (I was not able to test everything running it locally). Maybe you could try it in your hubs-compose and see if it works? I think it should, so I'm marking it as ready for review and requesting your review of it :)

Assuming you like the content of the PR, I think we just merge despite the failing checks once/if you give it the green light.

@Exairnous
Copy link
Contributor Author

As discussed at a governance team meeting, I am merging this on my own recognizance.

@Exairnous Exairnous merged commit 103e3e2 into master Sep 9, 2024
9 of 10 checks passed
@Exairnous Exairnous deleted the remove-mozilla-branding-1 branch September 9, 2024 05:34
@56789KD
Copy link

56789KD commented Oct 23, 2024

Comment viewing Mozilla

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.

2 participants