Skip to content

Commit

Permalink
Merge pull request #6493 from Hubs-Foundation/mozilla-branding-removal-1
Browse files Browse the repository at this point in the history
[Mozilla Branding Removal] First pass at removing Mozilla references, links, images, etc.
  • Loading branch information
Exairnous committed Aug 30, 2024
2 parents 49fe109 + 5ee2350 commit f3c685e
Show file tree
Hide file tree
Showing 88 changed files with 252 additions and 246 deletions.
4 changes: 2 additions & 2 deletions .defaults.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
SHORTLINK_DOMAIN="hub.link"

# The Reticulum backend to connect to. Used for storing information about active hubs.
# See here for the server code: https://github.com/mozilla/reticulum
# See here for the server code: https://github.com/Hubs-Foundation/reticulum
RETICULUM_SERVER="dev.reticulum.io"

# CORS proxy.
CORS_PROXY_SERVER="hubs-proxy.com"

# The thumbnailing backend to connect to.
# See here for the server code: https://github.com/MozillaReality/farspark or https://github.com/MozillaReality/nearspark
# See here for the server code: https://github.com/Hubs-Foundation/farspark or https://github.com/Hubs-Foundation/nearspark
THUMBNAIL_SERVER="nearspark-dev.reticulum.io"

# The root URL under which Hubs expects environment GLTF bundles to be served.
Expand Down
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Ask question
url: https://github.com/mozilla/hubs/discussions
url: https://github.com/Hubs-Foundation/hubs/discussions
about: Ask questions and discuss with other community members.
4 changes: 2 additions & 2 deletions .github/workflows/hc-pkgcaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:

jobs:
hcpkgrelease:
uses: mozilla/hubs-ops/.github/workflows/HcPkgPreReleaseGitops.yaml@master
uses: Hubs-Foundation/hubs-ops/.github/workflows/HcPkgPreReleaseGitops.yaml@master
with:
main: master
releaseTrackingBranch: hubs-cloud
qaTestBranch: qa-test
qaTestBranch: qa-test
2 changes: 1 addition & 1 deletion .github/workflows/hubs-RetPageOrigin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- "smoke05"
jobs:
turkeyGitops:
uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
uses: Hubs-Foundation/hubs-ops/.github/workflows/turkeyGitops.yml@master
with:
registry: mozillareality
dockerfile: RetPageOriginDockerfile
Expand Down
10 changes: 6 additions & 4 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# Community Participation Guidelines

This repository is governed by Mozilla's code of conduct and etiquette guidelines.
This repository is governed by the Hubs Foundations' code of conduct and etiquette guidelines.
For more details, please read the
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).
[Community Participation Guidelines](https://hubsfoundation.org) (TBD).
For now, the rules of the Hubs Discord server can be considered to stand in.

## How to Report
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://hubsfoundation.org)' page (TBD).
For now, any reports should be made on the Hubs Discord server.

<!--
## Project Specific Etiquette
In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
In some cases, there will be additional project etiquette.
Please update for your project.
-->
42 changes: 22 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ Contributors are expected to abide by the project's [Code of Conduct](CODE_OF_CO

The following GitHub projects are part of the Hubs platform and governed by these contributing guidelines:

* https://github.com/mozilla/hubs/ - the core Hubs project
* https://github.com/mozilla/spoke - 3D editor for creating scenes
* https://github.com/mozilla/janus-plugin-sfu - networking
* https://github.com/mozilla/reticulum - server infrastructure for Hubs
* https://github.com/mozilla/hubs-ops - operations infrastructure for Hubs
* https://github.com/MozillaReality/hubs-discord-bot - Hubs' Discord integration
* https://github.com/Hubs-Foundation/hubs/ - the core Hubs project
* https://github.com/Hubs-Foundation/spoke - 3D editor for creating scenes
* https://github.com/Hubs-Foundation/reticulum - server infrastructure for Hubs
* https://github.com/Hubs-Foundation/hubs-ops - operations infrastructure for Hubs
* https://github.com/Hubs-Foundation/hubs-discord-bot - Hubs' Discord integration
* https://github.com/Hubs-Foundation/hubs-blender-exporter - Hubs Blender add-on
* https://github.com/Hubs-Foundation/hubs-behavior-graphs-addon - Hubs Behavior Graphs client add-on
* https://github.com/Hubs-Foundation/blender-gltf-behavior-graph - Hubs Behavior Graphs Blender add-on

## Quick Start

We are happy to receive contributions to the Hubs platform in a number of different ways as outlined below. Please note that all contributions are subject to approval by the project maintainers. We ask (but do not require) that those interested in contributing to Hubs consider joining the public [Hubs Discord server](https://discord.gg/dFJncWwHun) to connect with the dev team, ask questions, and view discussions about work being done on the project.

### 💻 Code Contributions
Hubs has a client-server architecture that gives multiple users the ability to connect to a shared room on the server. If you are interested in contributing to the Hubs client, continue on to the [development workflow guide](#development-workflow) to get started. If you want to contribute to the networking or infrastructure, consider looking at the [reticulum](https://github.com/mozilla/reticulum) or [janus](https://github.com/mozilla/janus-plugin-sfu) repositories. If you are interested in working on the code for Spoke, the 3D editor used to create custom environments for Hubs rooms, explore the [Spoke](https://github.com/mozilla/spoke) repository.
Hubs has a client-server architecture that gives multiple users the ability to connect to a shared room on the server. If you are interested in contributing to the Hubs client, continue on to the [development workflow guide](#development-workflow) to get started. If you want to contribute to the networking or infrastructure, consider looking at the [reticulum](https://github.com/Hubs-Foundation/reticulum) repository. If you are interested in working on the code for Spoke, the 3D editor used to create custom environments for Hubs rooms, or the Blender add-on, explore the [Spoke](https://github.com/Hubs-Foundation/spoke) and [Hubs Blender add-on](https://github.com/Hubs-Foundation/hubs-blender-exporter) repositories. If you are interested in working on Hubs' Discord integration, check out the [Hubs Discord Bot](https://github.com/Hubs-Foundation/hubs-discord-bot) repository. If you want to improve Hubs' interactivity, check out the [Behavior Graphs client add-on](https://github.com/Hubs-Foundation/hubs-behavior-graphs-addon) and [Behavior Graphs Blender add-on](https://github.com/Hubs-Foundation/blender-gltf-behavior-graph) repositories.

For more information on the inner workings of Hubs and the architectural decisions behind the project, check out [this presentation on the Mozilla Hubs Code Base](https://vimeo.com/365531296) by Engineering Lead Greg Fodor.

Issues that are open are tagged. If you explore a bug or feature request that you'd like to fix, make a comment on the case so we know you're looking into it! We try to use the '[good first issue](https://github.com/mozilla/hubs/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)' tag to identify some cases that may be easier than others to begin with as you get started with the code base.
Issues that are open are tagged. If you explore a bug or feature request that you'd like to fix, make a comment on the case so we know you're looking into it! We try to use the '[good first issue](https://github.com/Hubs-Foundation/hubs/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)' tag to identify some cases that may be easier than others to begin with as you get started with the code base.

Steps to contributing code to the Hubs project:

1. Clone the repo you want to contribute to and get things running locally
2. Find an issue or improvement that you want to fix - give us a heads up that you're working on it by dropping in a comment on the issue.
3. Fix the bug! Test out your changes on your local setup and let us know if you have questions or want another opinion about the fix.
3. Fix the bug or add the feature! Test out your changes on your local setup and let us know if you have questions or want another opinion about the contribution.
4. Run `npm run test` to make sure that there are no linter errors and the tests pass.
5. Submit your PR for a code review and someone from the team will take a look and give feedback. Make sure you follow up! We'll close the PR if it seems like you've abandoned it by not responding to any questions or comments we leave in the review. If your PR adds a new feature, consider requesting the 'What's New' tag. With the 'What's New' tag, any text in the main body of the PR up to (and including) an image will be added to the [hubs website](https://hubs.mozilla.com/whats-new). Gifs are especially appreciated! [This pull request](https://github.com/mozilla/hubs/pull/1536) shows an example of how the 'What's New' tag can be used.
6. Celebrate! 🎉 You're helping Mozilla's mission to make the web an open and accessible place for social experiences!
5. Submit your PR for a code review and someone from the team will take a look and give feedback. Make sure you follow up! We'll close the PR if it seems like you've abandoned it by not responding to any questions or comments we leave in the review. If your PR adds a new feature, consider requesting the 'What's New' tag. With the 'What's New' tag, any text in the main body of the PR up to (and including) an image will be added to the [hubs website](https://demo.hubsfoundation.org/whats-new). Gifs are especially appreciated! [This pull request](https://github.com/Hubs-Foundation/hubs/pull/1536) shows an example of how the 'What's New' tag can be used.
6. Celebrate! 🎉 You're helping to make the web an open and accessible place for social experiences!

### 🐛Filing Issues and Feature Requests
Reporting bugs, feature requests, and questions that you have about the platform helps the team prioritize the work that we're doing and make Hubs better! We welcome user-submitted issues and use Github's built-in issue tracking for our bug reporting process.
Expand All @@ -52,10 +52,10 @@ We will do our best to respond to and tag inbound issues as they are submitted i
| P3 | Address when able after P2 bugs are fixed. Affects a small set of users inconsistently in a non-breaking way with an easy workaround. | Every so often, a standalone VR headset will show up as a mobile phone in the user list. Refreshing fixes it. |

### 🎨 3D Art
If you are a 3D artist and want to support what we're doing with Hubs, consider creating and releasing content under a Creative Commons license or creating scenes using the [Spoke scene editor](https://hubs.mozilla.com/spoke) and releasing them as remixable environments. Content with low polygon counts that are optimized to run well on the web are much appreciated! In particular, we'd love to see scenes that capture a wide range of experiences.
If you are a 3D artist and want to support what we're doing with Hubs, consider creating and releasing content under a Creative Commons license and sharing them in the Hubs Discord. Content with low polygon counts that are optimized to run well on the web are much appreciated! In particular, we'd love to see scenes that capture a wide range of experiences.

### 📜 Documentation
Our documentation for Hubs is hosted on the [GitHub Hubs Wiki](https://github.com/mozilla/hubs/wiki) section of the project. The documentation for Spoke is hosted on the [GitHub Spoke Wiki](https://github.com/mozilla/spoke/wiki) For contributing corrections or additional pages for the Wiki, please file an issue as a suggestion in the corresponding repository with your proposed content and we will review it and add it to the wiki when all looks good!
Our documentation for Hubs is hosted on the [GitHub Hubs Wiki](https://github.com/Hubs-Foundation/hubs/wiki) section of the project. The documentation for Spoke is hosted on the [GitHub Spoke Wiki](https://github.com/Hubs-Foundation/spoke/wiki) Other docs can be found in the [hubs-docs repository](https://github.com/Hubs-Foundation/hubs-docs) (this provides the content for docs.hubsfoundation.org) For contributing corrections or additional pages for the Wiki, please file an issue as a suggestion in the corresponding repository with your proposed content and we will review it and add it to the wiki when all looks good! For contributing corrections or additions to the hubs-docs repository, please open a pull request.

### 🌐 Localization
If you would like to add/update a localization translation for Hubs, please see the [Localization README](src/assets/locales/README.md). Then, please submit a pull request with your new/updated localization changes.
Expand All @@ -70,7 +70,7 @@ A guide for general best practices can be found [here](./doc/best-practices.md)

## Development Workflow

Getting set up to work on the Hubs client main fork is a little different than working on a custom client for a Hubs Cloud deployment. If you're looking to set up your development environment for your own Hubs Cloud deployment see [this guide](https://hubs.mozilla.com/docs/hubs-cloud-custom-clients.html).
Getting set up to work on the Hubs client main fork is a little different than working on a custom client for a Hubs Community Edition deployment. If you're looking to set up your own local development environment, check out [Hubs Compose]((https://github.com/Hubs-Foundation/hubs-compose).

### 0. Dependencies

Expand All @@ -81,7 +81,7 @@ Getting set up to work on the Hubs client main fork is a little different than w
Clone the Hubs repository and install the npm dependencies.

```bash
git clone https://github.com/mozilla/hubs.git
git clone https://github.com/Hubs-Foundation/hubs.git
cd hubs
# nvm use v16.16.0 # if using NVM
npm ci
Expand All @@ -95,7 +95,9 @@ There are 3 different commands for starting up the client's webpack-dev-server i

#### `npm run dev`

This command runs the client against the Mozilla dev cluster. If you're just doing frontend development on the main fork of Hubs, this is probably the command you should be using.
> Note: npm run dev doesn't currently work, use Hubs Compose instead.
This command runs the client against the dev cluster. If you're just doing frontend development on the main fork of Hubs, this is probably the command you should be using.

> Note: When using this command, the client will use a default configuration with all features enabled.
Expand All @@ -107,7 +109,7 @@ This command requires you to be logged into a Hubs Cloud instance. You can login
#### `npm run local`

This command runs against local services. You'll use this if you are running an instance of Reticulum locally. More info on how to run Reticulum locally is located [here](https://github.com/mozilla/reticulum#run-hubs-against-a-local-reticulum-instance).
This command runs against local services. You'll use this if you are running an instance of Reticulum locally. More info on how to run Reticulum locally is located [here](https://github.com/Hubs-Foundation/reticulum#run-hubs-against-a-local-reticulum-instance).

> Note: When using this command, the client will use a default configuration with all features enabled.
Expand Down Expand Up @@ -172,7 +174,7 @@ hubs/
```
### 8. Testing on an HMD

The simplest way to test on an HMD is to use `npm run dev` from Step 2 above while having 8080 port traffic on your device point to you local dev instance's port 8080. In order to do that, you'll need to do a few things that will vary per device.
The simplest way to test on an HMD is to use `npm run dev` from Step 2 above while having 8080 port traffic on your device point to your local dev instance's port 8080. In order to do that, you'll need to do a few things that will vary per device.

#### Oculus Quest

Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pipeline {
if (showQAPromoteCommand == "true") {
def text = (
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
"<https://github.com/mozilla/hubs/commit/$gitSha|$gitSha> ${hubsVersion} " +
"<https://github.com/Hubs-Foundation/hubs/commit/$gitSha|$gitSha> ${hubsVersion} " +
"Hubs: ```${gitSha} ${gitMessage}```\n" +
"${packageIdent} built and uploaded - to promote:\n" +
"`/mr promote-hubs-qa ${packageIdent}`"
Expand All @@ -81,7 +81,7 @@ pipeline {
} else {
def text = (
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
"<https://github.com/mozilla/hubs/commit/$gitSha|$gitSha> ${hubsVersion} " +
"<https://github.com/Hubs-Foundation/hubs/commit/$gitSha|$gitSha> ${hubsVersion} " +
"Hubs: ```${gitSha} ${gitMessage}```\n" +
"<${smokeURL}?required_version=${hubsVersion}|Smoke Test> - to push:\n" +
"`/mr hubs deploy ${hubsVersion} s3://${targetS3Bucket}`"
Expand Down
2 changes: 1 addition & 1 deletion PRIVACY.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Moved to https://www.mozilla.org/en-US/privacy/hubs/
TBD
2 changes: 1 addition & 1 deletion PROMOTION.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Avatar Promotion

As part of saving your avatar, you can choose to allow Mozilla to promote your avatar. If you choose to allow Mozilla to promote your avatar, you grant to Mozilla a non-exclusive, worldwide, royalty-free, sublicensable license under all of your rights necessary to review your avatar, and publish, distribute, and promote it as part of Hubs or related Mozilla promotional efforts.
As part of saving your avatar, you can choose to allow the Hubs instance owner to promote your avatar. If you choose to allow the owner to promote your avatar, you grant to the owner a non-exclusive, worldwide, royalty-free, sublicensable license under all of your rights necessary to review your avatar, publish it, and distribute it to the users of the Hubs instance.
Loading

0 comments on commit f3c685e

Please sign in to comment.