diff --git a/.defaults.env b/.defaults.env index b2e71b8cc7..1ce19bf5a0 100644 --- a/.defaults.env +++ b/.defaults.env @@ -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. diff --git a/.github/config.yml b/.github/config.yml index 7175f12fc0..9086dd22e0 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -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. diff --git a/.github/workflows/hc-pkgcaller.yml b/.github/workflows/hc-pkgcaller.yml index 85781397f4..5b8a1693be 100644 --- a/.github/workflows/hc-pkgcaller.yml +++ b/.github/workflows/hc-pkgcaller.yml @@ -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 \ No newline at end of file + qaTestBranch: qa-test diff --git a/.github/workflows/hubs-RetPageOrigin.yml b/.github/workflows/hubs-RetPageOrigin.yml index c226e94a98..27231b7c6c 100644 --- a/.github/workflows/hubs-RetPageOrigin.yml +++ b/.github/workflows/hubs-RetPageOrigin.yml @@ -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 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 498baa3fb0..9527d5fb0e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -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. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 590e06ca42..03fcce136f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. @@ -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. @@ -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 @@ -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 @@ -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. @@ -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. @@ -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 diff --git a/Jenkinsfile b/Jenkinsfile index cfb35d5fb8..438fd4ff4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,7 +72,7 @@ pipeline { if (showQAPromoteCommand == "true") { def text = ( "** *${jobName}* " + - " ${hubsVersion} " + + " ${hubsVersion} " + "Hubs: ```${gitSha} ${gitMessage}```\n" + "${packageIdent} built and uploaded - to promote:\n" + "`/mr promote-hubs-qa ${packageIdent}`" @@ -81,7 +81,7 @@ pipeline { } else { def text = ( "** *${jobName}* " + - " ${hubsVersion} " + + " ${hubsVersion} " + "Hubs: ```${gitSha} ${gitMessage}```\n" + "<${smokeURL}?required_version=${hubsVersion}|Smoke Test> - to push:\n" + "`/mr hubs deploy ${hubsVersion} s3://${targetS3Bucket}`" diff --git a/PRIVACY.md b/PRIVACY.md index 1dbe952d25..a0990367ef 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -1 +1 @@ -Moved to https://www.mozilla.org/en-US/privacy/hubs/ \ No newline at end of file +TBD diff --git a/PROMOTION.md b/PROMOTION.md index 6e62e2f725..2eb24f32d3 100644 --- a/PROMOTION.md +++ b/PROMOTION.md @@ -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. diff --git a/README.md b/README.md index e4983c2a76..08006517e6 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ The client-side code for Hubs, an online 3D collaboration platform that works fo ## Getting Started -If you would like to run Hubs on your own servers, check out [Hubs Cloud](https://hubs.mozilla.com/docs/hubs-cloud-intro.html). +If you would like to run Hubs on your own servers, check out [Hubs Community Edition](https://github.com/Hubs-Foundation/hubs-cloud/tree/master/community-edition). -If you would like to deploy a custom client to your existing Hubs Cloud instance please refer to [this guide](https://hubs.mozilla.com/docs/hubs-cloud-custom-clients.html). +If you would like to deploy a custom client to your existing Hubs Cloud instance please refer to [this guide](https://docs.hubsfoundation.org/hubs-cloud-custom-clients.html). If you would like to contribute to the main fork of the Hubs client please see the [contributor guide](./CONTRIBUTING.md). @@ -21,7 +21,7 @@ If you just want to check out how Hubs works and make your own modifications con Run the following commands: ```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 @@ -37,7 +37,7 @@ The backend dev server is configured with CORS to only accept connections from " Then visit https://hubs.local:8080 (note: HTTPS is required, you'll need to accept the warning for the self-signed SSL certificate) -> Note: When running the Hubs client locally, you will still connect to the development versions of our [Janus WebRTC](https://github.com/mozilla/janus-plugin-sfu) and [reticulum](https://github.com/mozilla/reticulum) servers. These servers do not allow being accessed outside of localhost. If you want to host your own Hubs servers, please check out [Hubs Cloud](https://hubs.mozilla.com/docs/hubs-cloud-intro.html). +> Note: When running the Hubs client locally, you will still connect to the development versions of the [reticulum](https://github.com/Hubs-Foundation/reticulum) server. This server does not allow being accessed outside of localhost. If you want to host your own Hubs servers, please check out [Hubs Community Edition](https://github.com/Hubs-Foundation/hubs-cloud/tree/master/community-edition). ## Contributing @@ -49,11 +49,9 @@ Contributors are expected to abide by the project's [Code of Conduct](./CODE_OF_ ## Additional Resources -* [Reticulum](https://github.com/mozilla/reticulum) - Phoenix-based backend for managing state and presence. -* [NAF Janus Adapter](https://github.com/mozilla/naf-janus-adapter) - A [Networked A-Frame](https://github.com/networked-aframe) adapter for the Janus SFU service. -* [Janus Gateway](https://github.com/meetecho/janus-gateway) - A WebRTC proxy used for centralizing network traffic in this client. -* [Janus SFU Plugin](https://github.com/mozilla/janus-plugin-sfu) - Plugins for Janus which enables it to act as a SFU. -* [Hubs-Ops](https://github.com/mozilla/hubs-ops) - Infrastructure as code + management tools for running necessary backend services on AWS. +* [Reticulum](https://github.com/Hubs-Foundation/reticulum) - Phoenix-based backend for managing state and presence. +* [Networked A-Frame](https://github.com/Hubs-Foundation/networked-aframe). +* [Hubs-Ops](https://github.com/Hubs-Foundation/hubs-ops) - Infrastructure as code + management tools for running necessary backend services on AWS. ## License diff --git a/REMIXING.md b/REMIXING.md index d0bb8e5d7d..0feba95629 100644 --- a/REMIXING.md +++ b/REMIXING.md @@ -4,4 +4,4 @@ Allowing remixing means that others can download, edit, change, and re-publish y You can change this setting at any time, by re-saving your avatar. -If you don't allow remixing, your content will be published under the Hubs [Terms of Service](https://www.mozilla.org/en-US/about/legal/terms/hubs/). +If you don't allow remixing, your content will be published under the Hubs [Terms of Service](https://hubsfoundation.org/hubs-terms-of-use) (TBD). diff --git a/SECURITY.md b/SECURITY.md index 9522c489bf..868779cda7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,4 +2,4 @@ ## Reporting a Vulnerability -If you've discovered a security issue, please report it through security@mozilla.org +If you've discovered a security issue, please report it privately (DM) to the governance team on the Hubs Discord. A more formal security reporting procedure TBD. diff --git a/TERMS.md b/TERMS.md index 4c4f82aaaa..a0990367ef 100644 --- a/TERMS.md +++ b/TERMS.md @@ -1 +1 @@ -Moved to https://www.mozilla.org/en-US/about/legal/terms/hubs/ \ No newline at end of file +TBD diff --git a/admin/.defaults.env b/admin/.defaults.env index 338538c51c..cba53780c4 100644 --- a/admin/.defaults.env +++ b/admin/.defaults.env @@ -8,7 +8,7 @@ CONFIGURABLE_SERVICES="janus-gateway,reticulum,hubs,spoke" ITA_SERVER="http://hubs.local:3333" # 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" # PostgREST server configured to allow administrative access to the db. diff --git a/admin/package-lock.json b/admin/package-lock.json index 788709be8c..29904c666b 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -11,15 +11,15 @@ "dependencies": { "@iarna/toml": "^2.2.3", "@mozilla/lilypad-ui": "^1.8.2", - "aframe": "github:mozillareality/aframe#hubs/master", - "bitecs": "github:mozilla/bitECS#hubs-patches", + "aframe": "github:hubs-foundation/aframe#hubs/master", + "bitecs": "github:hubs-foundation/bitECS#hubs-patches", "classnames": "^2.2.5", "hubs": "file:..", "react": "^16.1.1", "react-admin": "^2.6.3", "react-dom": "^16.1.1", "react-intl": "^2.4.0", - "three": "github:mozillareality/three.js#hubs-patches-141" + "three": "github:hubs-foundation/three.js#hubs-patches-141" }, "devDependencies": { "@babel/core": "^7.18.9", @@ -81,11 +81,11 @@ "@mozilla/lilypad-ui": "^1.8.3", "@mozillareality/easing-functions": "^0.1.1", "@popperjs/core": "^2.4.4", - "aframe": "github:mozillareality/aframe#hubs/master", + "aframe": "github:hubs-foundation/aframe#hubs/master", "ammo-debug-drawer": "github:infinitelee/ammo-debug-drawer", - "ammo.js": "github:mozillareality/ammo.js#hubs/master", - "animejs": "github:mozillareality/anime#hubs/master", - "bitecs": "github:mozilla/bitECS#hubs-patches", + "ammo.js": "github:hubs-foundation/ammo.js#hubs/master", + "animejs": "github:hubs-foundation/anime#hubs/master", + "bitecs": "github:hubs-foundation/bitECS#hubs-patches", "buffered-interpolation": "github:Infinitelee/buffered-interpolation", "classnames": "^2.2.5", "color": "^3.1.2", @@ -106,12 +106,12 @@ "js-cookie": "^2.2.0", "jsonschema": "^1.2.2", "jwt-decode": "^2.2.0", - "lib-hubs": "github:mozillareality/lib-hubs#master", + "lib-hubs": "github:hubs-foundation/lib-hubs#master", "linkify-it": "^2.0.3", "markdown-it": "^12.3.2", "moving-average": "^1.0.0", - "networked-aframe": "github:mozillareality/networked-aframe#6093c3a0b2867a9e141cd5c19f7d13dfa7c38479", - "nipplejs": "github:mozillareality/nipplejs#mr-social-client/master", + "networked-aframe": "github:hubs-foundation/networked-aframe#6093c3a0b2867a9e141cd5c19f7d13dfa7c38479", + "nipplejs": "github:hubs-foundation/nipplejs#mr-social-client/master", "node-ensure": "0.0.0", "normalize.css": "^8.0.1", "pdfjs-dist": "^2.14.305", @@ -135,8 +135,8 @@ "screenfull": "^4.0.1", "sdp-transform": "^2.14.1", "semver": "^7.3.2", - "three": "github:mozillareality/three.js#65b5105908f5f135cad25fed07e25f15f3876777", - "three-ammo": "github:mozillareality/three-ammo", + "three": "github:hubs-foundation/three.js#65b5105908f5f135cad25fed07e25f15f3876777", + "three-ammo": "github:hubs-foundation/three-ammo", "three-gltf-extensions": "^0.0.14", "three-mesh-bvh": "^0.3.7", "three-pathfinding": "^1.1.0", @@ -215,7 +215,7 @@ "sass-loader": "^13.0.2", "selfsigned": "^2.0.1", "shelljs": "^0.8.5", - "spritesheet-js": "github:mozillareality/spritesheet.js#hubs/master", + "spritesheet-js": "github:hubs-foundation/spritesheet.js#hubs/master", "style-loader": "^3.3.1", "stylelint": "^14.9.1", "stylelint-config-recommended-scss": "^7.0.0", @@ -2978,7 +2978,7 @@ }, "node_modules/aframe": { "version": "1.0.3", - "resolved": "git+ssh://git@github.com/mozillareality/aframe.git#0fa14187b8f3e90726385904591eba799380df79", + "resolved": "git+ssh://git@github.com/hubs-foundation/aframe.git#0fa14187b8f3e90726385904591eba799380df79", "license": "MIT", "dependencies": { "custom-event-polyfill": "^1.0.6", @@ -3466,7 +3466,7 @@ }, "node_modules/bitecs": { "version": "0.3.38", - "resolved": "git+ssh://git@github.com/mozilla/bitECS.git#913b4ae261684eee205251e41a3250d1c1a2817e", + "resolved": "git+ssh://git@github.com/hubs-foundation/bitECS.git#913b4ae261684eee205251e41a3250d1c1a2817e", "license": "MPL-2.0" }, "node_modules/body-parser": { @@ -9749,7 +9749,7 @@ }, "node_modules/three": { "version": "0.141.0", - "resolved": "git+ssh://git@github.com/mozillareality/three.js.git#65b5105908f5f135cad25fed07e25f15f3876777", + "resolved": "git+ssh://git@github.com/hubs-foundation/three.js.git#65b5105908f5f135cad25fed07e25f15f3876777", "license": "MIT" }, "node_modules/thunky": { @@ -12740,8 +12740,8 @@ "requires": {} }, "aframe": { - "version": "git+ssh://git@github.com/mozillareality/aframe.git#0fa14187b8f3e90726385904591eba799380df79", - "from": "aframe@github:mozillareality/aframe#hubs/master", + "version": "git+ssh://git@github.com/hubs-foundation/aframe.git#0fa14187b8f3e90726385904591eba799380df79", + "from": "aframe@github:hubs-foundation/aframe#hubs/master", "requires": { "custom-event-polyfill": "^1.0.6", "debug": "ngokevin/debug#noTimestamp", @@ -13107,8 +13107,8 @@ "dev": true }, "bitecs": { - "version": "git+ssh://git@github.com/mozilla/bitECS.git#913b4ae261684eee205251e41a3250d1c1a2817e", - "from": "bitecs@github:mozilla/bitECS#hubs-patches" + "version": "git+ssh://git@github.com/hubs-foundation/bitECS.git#913b4ae261684eee205251e41a3250d1c1a2817e", + "from": "bitecs@github:hubs-foundation/bitECS#hubs-patches" }, "body-parser": { "version": "1.20.1", @@ -15131,14 +15131,14 @@ "@types/three": "^0.141.0", "@types/webxr": "^0.5.0", "acorn": "^8.8.0", - "aframe": "github:mozillareality/aframe#hubs/master", + "aframe": "github:hubs-foundation/aframe#hubs/master", "ammo-debug-drawer": "github:infinitelee/ammo-debug-drawer", - "ammo.js": "github:mozillareality/ammo.js#hubs/master", - "animejs": "github:mozillareality/anime#hubs/master", + "ammo.js": "github:hubs-foundation/ammo.js#hubs/master", + "animejs": "github:hubs-foundation/anime#hubs/master", "ava": "^4.3.1", "babel-loader": "^8.2.5", "babel-plugin-react-intl": "^8.2.21", - "bitecs": "github:mozilla/bitECS#hubs-patches", + "bitecs": "github:hubs-foundation/bitECS#hubs-patches", "buffered-interpolation": "github:Infinitelee/buffered-interpolation", "classnames": "^2.2.5", "color": "^3.1.2", @@ -15181,15 +15181,15 @@ "jsdom": "^20.0.0", "jsonschema": "^1.2.2", "jwt-decode": "^2.2.0", - "lib-hubs": "github:mozillareality/lib-hubs#master", + "lib-hubs": "github:hubs-foundation/lib-hubs#master", "linkify-it": "^2.0.3", "localstorage-memory": "^1.0.3", "markdown-it": "^12.3.2", "mediasoup-client": "^3.6.54", "mini-css-extract-plugin": "^2.6.1", "moving-average": "^1.0.0", - "networked-aframe": "github:mozillareality/networked-aframe#6093c3a0b2867a9e141cd5c19f7d13dfa7c38479", - "nipplejs": "github:mozillareality/nipplejs#mr-social-client/master", + "networked-aframe": "github:hubs-foundation/networked-aframe#6093c3a0b2867a9e141cd5c19f7d13dfa7c38479", + "nipplejs": "github:hubs-foundation/nipplejs#mr-social-client/master", "node-ensure": "0.0.0", "node-fetch": "^2.6.7", "normalize.css": "^8.0.1", @@ -15228,14 +15228,14 @@ "selfsigned": "^2.0.1", "semver": "^7.3.2", "shelljs": "^0.8.5", - "spritesheet-js": "github:mozillareality/spritesheet.js#hubs/master", + "spritesheet-js": "github:hubs-foundation/spritesheet.js#hubs/master", "style-loader": "^3.3.1", "stylelint": "^14.9.1", "stylelint-config-recommended-scss": "^7.0.0", "stylelint-scss": "^4.3.0", "tar": "^6.1.11", - "three": "github:mozillareality/three.js#65b5105908f5f135cad25fed07e25f15f3876777", - "three-ammo": "github:mozillareality/three-ammo", + "three": "github:hubs-foundation/three.js#65b5105908f5f135cad25fed07e25f15f3876777", + "three-ammo": "github:hubs-foundation/three-ammo", "three-gltf-extensions": "^0.0.14", "three-mesh-bvh": "^0.3.7", "three-pathfinding": "^1.1.0", @@ -17985,8 +17985,8 @@ } }, "three": { - "version": "git+ssh://git@github.com/mozillareality/three.js.git#65b5105908f5f135cad25fed07e25f15f3876777", - "from": "three@github:mozillareality/three.js#hubs-patches-141" + "version": "git+ssh://git@github.com/hubs-foundation/three.js.git#65b5105908f5f135cad25fed07e25f15f3876777", + "from": "three@github:hubs-foundation/three.js#hubs-patches-141" }, "thunky": { "version": "1.1.0", diff --git a/admin/package.json b/admin/package.json index 9904c0e856..5055a08d7f 100644 --- a/admin/package.json +++ b/admin/package.json @@ -6,7 +6,7 @@ "license": "MPL-2.0", "repository": { "type": "git", - "url": "https://github.com/mozilla/hubs.git" + "url": "https://github.com/Hubs-Foundation/hubs.git" }, "scripts": { "start": "webpack serve --mode=development --env hubsCloudDev=1", @@ -22,15 +22,15 @@ "dependencies": { "@iarna/toml": "^2.2.3", "@mozilla/lilypad-ui": "^1.8.2", - "aframe": "github:mozillareality/aframe#hubs/master", - "bitecs": "github:mozilla/bitECS#hubs-patches", + "aframe": "github:hubs-foundation/aframe#hubs/master", + "bitecs": "github:hubs-foundation/bitECS#hubs-patches", "classnames": "^2.2.5", "hubs": "file:..", "react": "^16.1.1", "react-admin": "^2.6.3", "react-dom": "^16.1.1", "react-intl": "^2.4.0", - "three": "github:mozillareality/three.js#hubs-patches-141" + "three": "github:hubs-foundation/three.js#hubs-patches-141" }, "devDependencies": { "@babel/core": "^7.18.9", diff --git a/admin/src/react-components/content-cdn.js b/admin/src/react-components/content-cdn.js index e7851a1fad..c7be23d189 100644 --- a/admin/src/react-components/content-cdn.js +++ b/admin/src/react-components/content-cdn.js @@ -355,13 +355,13 @@ class ContentCDNComponent extends Component {
  • Verify your workers are working.{" "} This link {" "} - should show the Mozilla homepage, and  + should show the Hubs Foundation homepage, and  this link {" "} - should should the Hubs "What's New" page. + should show the Hubs "What's New" page.
  • Once both links above are working, enable the 'Use Cloudflare Worker' setting diff --git a/admin/src/react-components/import-content.js b/admin/src/react-components/import-content.js index 35326a4348..94cba71729 100644 --- a/admin/src/react-components/import-content.js +++ b/admin/src/react-components/import-content.js @@ -441,8 +441,8 @@ class ImportContentComponent extends Component { You can import avatars and scenes from any other Hubs Cloud site, such as{" "} - - hubs.mozilla.com + + demo.hubsfoundation.org .
    Please ensure the content you import has a permissible license (such as{" "} @@ -454,7 +454,7 @@ class ImportContentComponent extends Component {
    -
    diff --git a/src/components/gltf-model-plus.js b/src/components/gltf-model-plus.js index 12090f11b9..13f5e87a19 100644 --- a/src/components/gltf-model-plus.js +++ b/src/components/gltf-model-plus.js @@ -343,7 +343,7 @@ function getHubsComponentsExtension(node) { } } -// Versions are documented here: https://github.com/mozilla/hubs/wiki/MOZ_hubs_components-Changelog +// Versions are documented here: https://github.com/Hubs-Foundation/hubs/wiki/MOZ_hubs_components-Changelog // Make sure to update the wiki and Spoke when bumping a version function runMigration(version, json) { if (version < 2) { @@ -476,7 +476,7 @@ class GLTFHubsPlugin { * This guarantees that components that add Object3Ds (ie. through addObject3DComponent) are not attached to non-Object3D * entities as it's not supported in the BitECS loader. * This was supported by the AFrame loader so this extension ensures backwards compatibility with all the existing scenes. - * For more context about this see: https://github.com/mozilla/hubs/pull/6121 + * For more context about this see: https://github.com/Hubs-Foundation/hubs/pull/6121 */ if ( node.mesh !== undefined || @@ -742,7 +742,7 @@ class GLTFMozTextureRGBE { } } -// Mozilla Hubs loop-animation component has a problem in the spec. +// Hubs loop-animation component has a problem in the spec. // The loop-animation component can refer to glTF.animations with // animation names but the glTF specification allows non-unique names // in glTF.animations so if there are multiple glTF.animations that @@ -755,7 +755,7 @@ class GLTFMozTextureRGBE { // have the same animation data and loop-component refers to the // first glTF.animation of the ones having the same name. This // plugin follows the assumption for the compatibility. -// Refer to https://github.com/mozilla/hubs/pull/6153 for details. +// Refer to https://github.com/Hubs-Foundation/hubs/pull/6153 for details. // TODO: Deprecate the loop-animation animation reference with name class GLTFHubsLoopAnimationComponent { constructor(parser) { diff --git a/src/components/media-video.js b/src/components/media-video.js index 04b3bf0ce5..3fc1a22eb7 100644 --- a/src/components/media-video.js +++ b/src/components/media-video.js @@ -368,7 +368,7 @@ AFRAME.registerComponent("media-video", { // Make sure that the audio is initialized to the right place. // Its matrix may not update if this element is not visible. - // See https://github.com/mozilla/hubs/issues/2855 + // See https://github.com/Hubs-Foundation/hubs/issues/2855 this.audio.updateMatrixWorld(); APP.audios.set(this.el, this.audio); @@ -409,7 +409,7 @@ AFRAME.registerComponent("media-video", { this.mediaElementAudioSource = null; if (!src.startsWith("hubs://")) { - // iOS video audio is broken on ios safari < 13.1.2, see: https://github.com/mozilla/hubs/issues/1797 + // iOS video audio is broken on ios safari < 13.1.2, see: https://github.com/Hubs-Foundation/hubs/issues/1797 if (!isIOS || semver.satisfies(detect().version, ">=13.1.2")) { // TODO FF error here if binding mediastream: The captured HTMLMediaElement is playing a MediaStream. Applying volume or mute status is not currently supported -- not an issue since we have no audio atm in shared video. this.mediaElementAudioSource = diff --git a/src/components/troika-text.js b/src/components/troika-text.js index 6ebbbd2310..154a836880 100644 --- a/src/components/troika-text.js +++ b/src/components/troika-text.js @@ -1,5 +1,5 @@ // This is based largely on: @lojjic https://github.com/lojjic/aframe-troika-text/blob/master/src/aframe-troika-text-component.js -// but has been made functional and restyled for Mozilla Hubs (hubs.mozilla.com) +// but has been made functional and restyled for Hubs (hubsfoundation.org) // by @jamesckane at Paradowski Creative (paradowski.com) import { Text } from "troika-three-text"; diff --git a/src/components/video-texture-target.js b/src/components/video-texture-target.js index aa7c5e5652..df44032d4a 100644 --- a/src/components/video-texture-target.js +++ b/src/components/video-texture-target.js @@ -42,7 +42,7 @@ AFRAME.registerComponent("video-texture-source", { const texture = this.renderTarget.texture; // Since we are rendering directly to a texture we need to flip it vertically - // See https://github.com/mozilla/hubs/pull/4126#discussion_r610120237 + // See https://github.com/Hubs-Foundation/hubs/pull/4126#discussion_r610120237 texture.matrixAutoUpdate = false; texture.matrix.scale(1, -1); texture.matrix.translate(0, 1); diff --git a/src/constants.ts b/src/constants.ts index 1fcb5e30e8..cded600d34 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -21,5 +21,5 @@ export enum AAModes { MSAA_8X = "MSAA_8X" } -export const PRIVACY = "https://www.mozilla.org/en-US/privacy/hubs/"; -export const TERMS = "https://www.mozilla.org/en-US/about/legal/terms/hubs/"; +export const PRIVACY = "https://hubsfoundation.org/hubs-privacy-policy"; +export const TERMS = "https://hubsfoundation.org/hubs-terms-of-use"; diff --git a/src/discord.html b/src/discord.html index d4d0ecf431..d2101222d7 100644 --- a/src/discord.html +++ b/src/discord.html @@ -6,18 +6,18 @@ - + - + - + - - + + - Hubs by Mozilla for Discord + Hubs for Discord @@ -39,4 +39,4 @@
    - \ No newline at end of file + diff --git a/src/discord.js b/src/discord.js index ab4e3e03d1..5a0efc53c0 100644 --- a/src/discord.js +++ b/src/discord.js @@ -6,8 +6,6 @@ import { WrappedIntlProvider } from "./react-components/wrapped-intl-provider"; import "./react-components/styles/global.scss"; import styles from "./assets/stylesheets/discord.scss"; import discordBotLogo from "./assets/images/discord-bot-logo.png"; -import discordBotVideoMP4 from "./assets/video/discord.mp4"; -import discordBotVideoWebM from "./assets/video/discord.webm"; import registerTelemetry from "./telemetry"; import { ThemeProvider } from "./react-components/styles/theme"; @@ -15,7 +13,7 @@ import { store } from "./utils/store-instance"; registerTelemetry("/discord", "Discord Landing Page"); -const inviteUrl = "https://forms.gle/GGPgarSuY5WaTNCT8"; +const inviteUrl = "https://github.com/Hubs-Foundation/hubs-discord-bot"; class DiscordPage extends Component { componentDidMount() {} @@ -63,10 +61,7 @@ class DiscordPage extends Component {
    - +
    diff --git a/src/inflators/model.tsx b/src/inflators/model.tsx index ad26136b51..cad41dc33b 100644 --- a/src/inflators/model.tsx +++ b/src/inflators/model.tsx @@ -152,7 +152,7 @@ export function inflateModel(world: HubsWorld, rootEid: number, { model }: Model // bitECS LoopAnimation Component is set to root entity for simpler implementation. // TODO: Probably the Hubs loop-animation component should be defined at scene // or root level. Revisit the specification. - // See https://github.com/mozilla/hubs/pull/5938#discussion_r1163410185 + // See https://github.com/Hubs-Foundation/hubs/pull/5938#discussion_r1163410185 if (model.animations !== undefined && model.animations.length > 0) { addComponent(world, MixerAnimatableInitialize, rootEid); inflateLoopAnimationInitialize(world, rootEid, loopAnimationParams); diff --git a/src/loaders/HubsTextureLoader.js b/src/loaders/HubsTextureLoader.js index 5037e17ce6..095bd9e864 100644 --- a/src/loaders/HubsTextureLoader.js +++ b/src/loaders/HubsTextureLoader.js @@ -19,7 +19,7 @@ export const TEXTURES_FLIP_Y = !HAS_IMAGE_BITMAP; // because huge textures resize + image bitmap can still even crash browsers. // // See -// - https://github.com/mozilla/hubs/issues/5295 +// - https://github.com/Hubs-Foundation/hubs/issues/5295 // - https://bugs.webkit.org/show_bug.cgi?id=241478 const IOS_TEXTURE_MAX_WIDTH = 2048; diff --git a/src/network-schemas.js b/src/network-schemas.js index b13ebcd823..b9e5a70260 100644 --- a/src/network-schemas.js +++ b/src/network-schemas.js @@ -19,7 +19,7 @@ function registerNetworkSchemas() { // Note: networked template ids are semantically important. We use the template suffix as a filter // for allowing and authorizing messages in reticulum. - // See `spawn_permitted?` in https://github.com/mozilla/reticulum/blob/master/lib/ret_web/channels/hub_channel.ex + // See `spawn_permitted?` in https://github.com/Hubs-Foundation/reticulum/blob/master/lib/ret_web/channels/hub_channel.ex // NAF schemas have been extended with a custom nonAuthorizedComponents property that is used to skip authorization // on certain components and properties regardless of hub or user permissions. See permissions-utils.js. diff --git a/src/react-components/auth/VerifyModal.stories.js b/src/react-components/auth/VerifyModal.stories.js index e798207688..6a16ca34a4 100644 --- a/src/react-components/auth/VerifyModal.stories.js +++ b/src/react-components/auth/VerifyModal.stories.js @@ -25,7 +25,7 @@ export const Verified = () => (
    - +
    diff --git a/src/react-components/avatar-editor.js b/src/react-components/avatar-editor.js index edf4795fbc..634a14e2cc 100644 --- a/src/react-components/avatar-editor.js +++ b/src/react-components/avatar-editor.js @@ -587,7 +587,10 @@ class AvatarEditor extends Component { values={{ a: chunks => ( @@ -611,7 +614,10 @@ class AvatarEditor extends Component { values={{ a: chunks => ( @@ -682,7 +688,7 @@ class AvatarEditor extends Component { {chunks} diff --git a/src/react-components/banner/Banner.js b/src/react-components/banner/Banner.js index 7846bbaea4..77ffd71a52 100644 --- a/src/react-components/banner/Banner.js +++ b/src/react-components/banner/Banner.js @@ -63,7 +63,7 @@ const Banner = () => { }; const onSubmit = useCallback(async data => { - const url = "https://basket.mozilla.org/news/subscribe/"; + const url = "https://hubsfoundation.org/mailing-list-sign-up/"; const body = "email=" + encodeURIComponent(data.email) + @@ -105,8 +105,8 @@ const Banner = () => { const Label = () => { return ( <> - I'm okay with Mozilla handling my info as explained in this{" "} - + I'm okay with the Hubs Foundation handling my info as explained in this{" "} + Privacy Notice diff --git a/src/react-components/home/SocialBar.js b/src/react-components/home/SocialBar.js index c902a1da1e..bb5d8569a7 100644 --- a/src/react-components/home/SocialBar.js +++ b/src/react-components/home/SocialBar.js @@ -14,16 +14,16 @@ export function SocialBar({ mobile }) { - + - + - + - + diff --git a/src/react-components/icons/HmcLogo.svg b/src/react-components/icons/HmcLogo.svg index 0ab5b39bdd..c3d80c0459 100644 --- a/src/react-components/icons/HmcLogo.svg +++ b/src/react-components/icons/HmcLogo.svg @@ -1,5 +1,8 @@ - - - - - + + + + + + + + diff --git a/src/react-components/layout/Footer.js b/src/react-components/layout/Footer.js index faf0bfe6f3..fecf0de42b 100644 --- a/src/react-components/layout/Footer.js +++ b/src/react-components/layout/Footer.js @@ -25,11 +25,11 @@ export function Footer({ {!hidePoweredBy && ( ( - + {chunks} ) @@ -62,14 +62,14 @@ export function Footer({ )} {isHmc && (
  • - - + +
    • )} {isHmc && (
  • - +
    • diff --git a/src/react-components/layout/Header.js b/src/react-components/layout/Header.js index 31c6e6bcc1..c9a9c5193c 100644 --- a/src/react-components/layout/Header.js +++ b/src/react-components/layout/Header.js @@ -51,7 +51,7 @@ export function Header({ )} {showSourceLink && (
  • - +
    • diff --git a/src/react-components/layout/MobileNav.js b/src/react-components/layout/MobileNav.js index 75b5089fd6..8266958d70 100644 --- a/src/react-components/layout/MobileNav.js +++ b/src/react-components/layout/MobileNav.js @@ -36,7 +36,7 @@ export function MobileNav({ isHmc, showDocsLink, docsUrl, showSourceLink, showCo )} {showSourceLink && (
  • - +
    • diff --git a/src/react-components/layout/PageContainer.js b/src/react-components/layout/PageContainer.js index 225effb215..511fe6eba7 100644 --- a/src/react-components/layout/PageContainer.js +++ b/src/react-components/layout/PageContainer.js @@ -17,7 +17,7 @@ export function PageContainer({ children, ...rest }) { enableSpoke={configs.feature("enable_spoke")} editorName={configs.translation("editor-name")} showDocsLink={configs.feature("show_docs_link")} - docsUrl={configs.link("docs", "https://hubs.mozilla.com/docs")} + docsUrl={configs.link("docs", "https://docs.hubsfoundation.org")} showSourceLink={configs.feature("show_source_link")} showCommunityLink={configs.feature("show_community_link")} communityUrl={configs.link("community", "https://discord.gg/dFJncWwHun")} diff --git a/src/react-components/media-browser.js b/src/react-components/media-browser.js index b139ad8806..19fc57cf9f 100644 --- a/src/react-components/media-browser.js +++ b/src/react-components/media-browser.js @@ -420,7 +420,7 @@ class MediaBrowserContainer extends Component { diff --git a/src/react-components/room/AvatarUrlModal.js b/src/react-components/room/AvatarUrlModal.js index ab8bba7d1a..efcfc562ff 100644 --- a/src/react-components/room/AvatarUrlModal.js +++ b/src/react-components/room/AvatarUrlModal.js @@ -21,7 +21,7 @@ export function AvatarUrlModal({ onSubmit, onClose }) { required: true })} description={ - + ( sender="John" timestamp={nextTimestamp()} messages={[ - { type: "chat", body: "https://mozilla.org" }, - { type: "chat", body: "Test message with url. https://hubs.mozilla.com Best site :point_up:" }, + { type: "chat", body: "https://hubsfoundation.org" }, + { type: "chat", body: "Test message with url. https://demo.hubsfoundation.org Best site :point_up:" }, { type: "chat", body: ":thumbsup:" } ]} /> @@ -89,8 +89,8 @@ export const Base = args => ( sender="Robert" timestamp={nextTimestamp()} messages={[ - { type: "chat", body: "https://mozilla.org" }, - { type: "chat", body: "Test message with url. https://hubs.mozilla.com" } + { type: "chat", body: "https://hubsfoundation.org" }, + { type: "chat", body: "Test message with url. https://hubsfoundation.org" } ]} /> {chunks} + a: chunks => {chunks} }} />

    diff --git a/src/react-components/room/InvitePopover.stories.js b/src/react-components/room/InvitePopover.stories.js index cc4c417a30..77f95ad8ef 100644 --- a/src/react-components/room/InvitePopover.stories.js +++ b/src/react-components/room/InvitePopover.stories.js @@ -13,7 +13,7 @@ const room = { url: "hubs.link/oggNnrN", code: "478816", embed: - '' + '' }; export const Base = () => ( @@ -33,7 +33,11 @@ export const Base = () => ( export const InviteLink = () => ( + } /> ); diff --git a/src/react-components/room/MoreMenuPopover.stories.js b/src/react-components/room/MoreMenuPopover.stories.js index 47900f7432..ecd938afb8 100644 --- a/src/react-components/room/MoreMenuPopover.stories.js +++ b/src/react-components/room/MoreMenuPopover.stories.js @@ -47,13 +47,13 @@ const menu = [ id: "report-issue", label: "Report Issue", icon: WarningCircleIcon, - href: "https://github.com/mozilla/hubs/issues/new/choose" + href: "https://github.com/Hubs-Foundation/hubs/issues/new/choose" }, { id: "help", label: "Help", icon: SupportIcon, - href: "https://hubs.mozilla.com/docs" + href: "https://docs.hubsfoundation.org" }, { id: "tos", diff --git a/src/react-components/room/Tip.stories.js b/src/react-components/room/Tip.stories.js index 210e229411..5986933027 100644 --- a/src/react-components/room/Tip.stories.js +++ b/src/react-components/room/Tip.stories.js @@ -15,7 +15,7 @@ export const Tips = ({ step }) => ( {}} dismissLabel="Skip" step={step}> - {"Welcome to Mozilla Hubs! Let's take a quick tour. 👋 Click and drag to look around."} + {"Welcome to Hubs! Let's take a quick tour. 👋 Click and drag to look around."} } /> diff --git a/src/react-components/room/TwitterOAuthModalContainer.js b/src/react-components/room/TwitterOAuthModalContainer.js index d4ab0e4623..13f4a89d5a 100644 --- a/src/react-components/room/TwitterOAuthModalContainer.js +++ b/src/react-components/room/TwitterOAuthModalContainer.js @@ -32,7 +32,7 @@ export function TwitterOAuthModalContainer({ hubChannel, onConnected, onClose, i console.error(error); if (error.message === "twitter_api_error" && isAdmin) { console.warn( - "Twitter might be misconfigured for Hubs Cloud. Check the docs here: https://hubs.mozilla.com/docs/hubs-cloud-third-party-integrations.html#twitter" + "Twitter might be misconfigured for Hubs Cloud. Check the docs here: https://docs.hubsfoundation.org/hubs-cloud-third-party-integrations.html#twitter" ); } onClose(); diff --git a/src/react-components/tokens/TokenList.js b/src/react-components/tokens/TokenList.js index b6d8b45cc8..0853aac2bb 100644 --- a/src/react-components/tokens/TokenList.js +++ b/src/react-components/tokens/TokenList.js @@ -63,7 +63,7 @@ const TokenMenuHeader = () => (

    {" "} - + . diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js index 2b07fcbdcc..c1dc959dbe 100644 --- a/src/react-components/ui-root.js +++ b/src/react-components/ui-root.js @@ -262,7 +262,7 @@ class UIRoot extends Component { }); } catch (e) { console.error(e); - this.props.exitScene(ExitReason.sceneError); // https://github.com/mozilla/hubs/issues/1950 + this.props.exitScene(ExitReason.sceneError); // https://github.com/Hubs-Foundation/hubs/issues/1950 } } @@ -1202,7 +1202,7 @@ class UIRoot extends Component { id: "see-plans", label: , icon: { src: hubsLogo, alt: "Logo" }, - href: "https://hubs.mozilla.com/#subscribe" + href: "https://hubsfoundation.org/getting-started" } ].filter(item => item) }, @@ -1293,7 +1293,7 @@ class UIRoot extends Component { id: "report-issue", label: , icon: WarningCircleIcon, - href: configs.link("issue_report", "https://hubs.mozilla.com/docs/help.html") + href: configs.link("issue_report", "https://docs.hubsfoundation.org/help.html") }, entered && { id: "start-tour", @@ -1305,13 +1305,13 @@ class UIRoot extends Component { id: "help", label: , icon: SupportIcon, - href: configs.link("docs", "https://hubs.mozilla.com/docs") + href: configs.link("docs", "https://docs.hubsfoundation.org") }, configs.feature("show_controls_link") && { id: "controls", label: , icon: SupportIcon, - href: configs.link("controls", "https://hubs.mozilla.com/docs/hubs-controls.html") + href: configs.link("controls", "https://docs.hubsfoundation.org/hubs-controls.html") }, configs.feature("show_whats_new_link") && { id: "whats-new", diff --git a/src/storage/store.js b/src/storage/store.js index 9484319356..dd7fc35eae 100644 --- a/src/storage/store.js +++ b/src/storage/store.js @@ -44,7 +44,7 @@ const defaultMaterialQuality = (function () { // use low audio panning quality (= equal power mode) by default // on Android as workaround until the root issue is fixed on // Android end. See -// - https://github.com/mozilla/hubs/issues/5057 +// - https://github.com/Hubs-Foundation/hubs/issues/5057 // - https://bugs.chromium.org/p/chromium/issues/detail?id=1308962 const defaultAudioPanningQuality = () => { return isAndroid() && !isMobileVR() ? "Low" : "High"; diff --git a/src/support.js b/src/support.js index bc779d35ef..8769d72c96 100644 --- a/src/support.js +++ b/src/support.js @@ -86,7 +86,7 @@ class Support extends React.Component { return (

    -

    Mozilla Hubs

    +

    Hubs


    · Unsupported · No Soportado · Nicht Unterstützt diff --git a/src/utils/chat-commands.ts b/src/utils/chat-commands.ts index 04fc257ad3..b3a471180a 100644 --- a/src/utils/chat-commands.ts +++ b/src/utils/chat-commands.ts @@ -75,7 +75,7 @@ function changeAvatar(avatarUrl: string) { } const TEST_ASSET_PREFIX = - "https://raw.githubusercontent.com/mozilla/hubs-sample-assets/main/Hubs%20Components/Exported%20GLB%20Models/"; + "https://raw.githubusercontent.com/Hubs-Foundation/hubs-sample-assets/main/Hubs%20Components/Exported%20GLB%20Models/"; const TEST_ASSET_SUFFIX = ".glb"; const FLAG_SCENE = "--scene"; const FLAG_AVATAR = "--avatar"; diff --git a/src/utils/detect-touchscreen.js b/src/utils/detect-touchscreen.js index 1f5fe032eb..fe7e3052df 100644 --- a/src/utils/detect-touchscreen.js +++ b/src/utils/detect-touchscreen.js @@ -23,7 +23,7 @@ function detectTouchScreen() { let hackyMobileSafariTestValue = null; -// HACK for https://github.com/mozilla/hubs/issues/1813 +// HACK for https://github.com/Hubs-Foundation/hubs/issues/1813 // Touchscreen controls depend on iPad and iPhone detection, // which recently regressed. For UA matching "Macintosh", enable // touchscreen controls if there exists a touchscreen. diff --git a/src/utils/entity-state-utils.ts b/src/utils/entity-state-utils.ts index de5158e00b..2fcdb0e1e3 100644 --- a/src/utils/entity-state-utils.ts +++ b/src/utils/entity-state-utils.ts @@ -261,7 +261,7 @@ function loadFromJson(hubChannel: HubChannel) { }; const TEST_ASSET_STATE = - "https://raw.githubusercontent.com/mozilla/hubs-sample-assets/main/Hubs%20Components/test_json/__NAME__"; + "https://raw.githubusercontent.com/Hubs-Foundation/hubs-sample-assets/main/Hubs%20Components/test_json/__NAME__"; export async function loadState(hubChannel: HubChannel, world: HubsWorld, state: string) { clearState(world, hubChannel); diff --git a/src/utils/i18n.js b/src/utils/i18n.js index 2376c1d934..9ad3ac5b00 100644 --- a/src/utils/i18n.js +++ b/src/utils/i18n.js @@ -46,7 +46,7 @@ function findLocale(locale) { // Also check the primary language subtag in case // we do not have an entry for full tag // See https://en.wikipedia.org/wiki/IETF_language_tag#Syntax_of_language_tags - // and https://github.com/mozilla/hubs/pull/3350/files#diff-70ef5717d3da03ef288e8d15c2fda32c5237d7f37074421496f22403e4475bf1R16 + // and https://github.com/Hubs-Foundation/hubs/pull/3350/files#diff-70ef5717d3da03ef288e8d15c2fda32c5237d7f37074421496f22403e4475bf1R16 const primaryLanguageSubtag = curLocale.split("-")[0].toLowerCase(); if (Object.prototype.hasOwnProperty.call(AVAILABLE_LOCALES, primaryLanguageSubtag)) { return primaryLanguageSubtag; diff --git a/src/utils/permissions-utils.js b/src/utils/permissions-utils.js index 84c5842794..5a5dd79abe 100644 --- a/src/utils/permissions-utils.js +++ b/src/utils/permissions-utils.js @@ -4,7 +4,7 @@ import { hasComponent } from "bitecs"; import { HoldableButton } from "../bit-components"; import { CAMERA_MODE_INSPECT } from "../systems/camera-system"; -// https://github.com/mozilla/hubs/wiki/Hubs-authorization +// https://github.com/Hubs-Foundation/hubs/wiki/Hubs-authorization export function showHoverEffect(el) { const isFrozen = el.sceneEl.is("frozen"); const isPinned = el.components.pinnable && el.components.pinnable.data.pinned; diff --git a/src/utils/vr-caps-detect.js b/src/utils/vr-caps-detect.js index 8687163260..31b7e2408b 100644 --- a/src/utils/vr-caps-detect.js +++ b/src/utils/vr-caps-detect.js @@ -70,7 +70,7 @@ export async function getAvailableVREntryTypes() { let displays = []; try { // Skip getVRDisplays on desktop Chrome since the API is in a broken state there. - // See https://github.com/mozilla/hubs/issues/892 + // See https://github.com/Hubs-Foundation/hubs/issues/892 if (browser.name !== "chrome" || isMobile) { // We pull the displays on non-WebVR capable mobile browsers so we can pick up cardboard. displays = isWebVRCapableBrowser || isCardboardCapableBrowser ? await navigator.getVRDisplays() : []; diff --git a/src/utils/webgl.js b/src/utils/webgl.js index 9a236283ca..94489e409f 100644 --- a/src/utils/webgl.js +++ b/src/utils/webgl.js @@ -22,7 +22,7 @@ export function patchWebGLRenderingContext() { // It appears that Galaxy S6 devices falsely report that they support // OES_texture_float in Firefox. This workaround disables float textures // for those devices. - // See https://github.com/mozilla/hubs/issues/32 and + // See https://github.com/Hubs-Foundation/hubs/issues/32 and // https://bugzilla.mozilla.org/show_bug.cgi?id=1338656 const originalGetExtension = WebGLRenderingContext.prototype.getExtension; const supportsFloatTextures = checkFloatTextureSupport(); diff --git a/test/browser-stack/tests/ie11.js b/test/browser-stack/tests/ie11.js index 11b8f06653..c031182413 100644 --- a/test/browser-stack/tests/ie11.js +++ b/test/browser-stack/tests/ie11.js @@ -14,7 +14,7 @@ async function runIE11UnsupportedTest() { }); try { - await driver.get("https://hubs.mozilla.com/demo"); + await driver.get("https://demo.hubsfoundation.org"); const unsupportedNotice = await driver.wait(until.elementLocated(by.id("support-root")), 10000); const unsupportedNoticeText = await unsupportedNotice.getText();