diff --git a/.github/workflows/spoke-RetPageOrigin.yml b/.github/workflows/spoke-RetPageOrigin.yml index 80d0c7e01..a7c8e0502 100644 --- a/.github/workflows/spoke-RetPageOrigin.yml +++ b/.github/workflows/spoke-RetPageOrigin.yml @@ -7,7 +7,7 @@ on: 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 498baa3fb..9527d5fb0 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 7c6439e9a..5f3c14ea2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -Contributors looking to get involved with Spoke's development should take a look at the [Hubs Contributor Docs](https://github.com/mozilla/hubs/blob/master/CONTRIBUTING.md). +Contributors looking to get involved with Spoke's development should take a look at the [Hubs Contributor Docs](https://github.com/Hubs-Foundation/hubs/blob/master/CONTRIBUTING.md). Contributors are expected to abide by the project's [Code of Conduct](./CODE_OF_CONDUCT.md) and to be respectful of the project and people working on it. diff --git a/Jenkinsfile b/Jenkinsfile index 011a37b06..c7d10c432 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,7 +72,7 @@ pipeline { if (showQAPromoteCommand == "true") { def text = ( "** *${jobName}* " + - " ${spokeVersion} " + + " ${spokeVersion} " + "Spoke: ```${gitSha} ${gitMessage}```\n" + "${packageIdent} built and uploaded - to promote:\n" + "`/mr promote-spoke-qa ${packageIdent}`" @@ -81,7 +81,7 @@ pipeline { } else { def text = ( "** *${jobName}* " + - " ${spokeVersion} " + + " ${spokeVersion} " + "Spoke: ```${gitSha} ${gitMessage}```\n" + "<${smokeURL}?required_version=${spokeVersion}|Smoke Test> - to push:\n" + "`/mr spoke deploy ${spokeVersion} s3://${targetS3Bucket}`" diff --git a/PROMOTION.md b/PROMOTION.md index 59a0d8182..a77af60f9 100644 --- a/PROMOTION.md +++ b/PROMOTION.md @@ -1,3 +1,3 @@ ## Scene Promotion -As part of publishing your scene, you can choose to allow Mozilla to promote your scene. If you choose to allow Mozilla to promote your scene, you grant to Mozilla a non-exclusive, worldwide, royalty-free, sublicensable license under all of Your rights necessary to review your scene, and publish, distribute, and promote it as part of Hubs and Spoke or related Mozilla promotional efforts. +As part of publishing your scene, you can choose to allow the Hubs instance owner to promote your scene. If you choose to allow the owner to promote your scene, you grant to the owner a non-exclusive, worldwide, royalty-free, sublicensable license under all of Your rights necessary to review your scene, publish it, and distribute it to the users of the Hubs instance. diff --git a/REMIXING.md b/REMIXING.md index 7e59e8dd9..cb76a1bdc 100644 --- a/REMIXING.md +++ b/REMIXING.md @@ -1,7 +1,7 @@ ## Remixing -Allowing remixing means that others can download, edit, change, and re-publish your Spoke scene as long as they give credit to the creators of the scene. If you allow allow remixing, you agree to license your scene under a [CC-BY 3.0](https://creativecommons.org/licenses/by/3.0/legalcode) license. We’ll provide you an opportunity to include the attribution information you want to include. This information will be associated with the scene, but not stored with your account. +Allowing remixing means that others can download, edit, change, and re-publish your Spoke scene as long as they give credit to the creators of the scene. If you allow remixing, you agree to license your scene under a [CC-BY 3.0](https://creativecommons.org/licenses/by/3.0/legalcode) license. We’ll provide you an opportunity to include the attribution information you want to include. This information will be associated with the scene, but not stored with your account. You can change this setting at any time, by re-publishing your scene. -If you don't allow remixing, your content will be published under the Hubs and Spoke [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 and Spoke [Terms of Service](https://hubsfoundation.org/hubs-terms-of-use) (TBD). diff --git a/docs/README.md b/docs/README.md index e46ba7e20..c8cdbcc2c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -23,7 +23,7 @@ ## Getting Started -- `git clone https://github.com/mozilla/Spoke.git` +- `git clone https://github.com/Hubs-Foundation/Spoke.git` - `cd Spoke` - `yarn install` - `yarn start` @@ -408,6 +408,6 @@ export default class HubsSoundPackSource extends AssetManifestSource { ``` -Our [Hubs Sound Pack repository](https://github.com/MozillaReality/hubs-sound-pack) is a great example and starting point for creating your own asset manifest source. +Our [Hubs Sound Pack repository](https://github.com/Hubs-Foundation/hubs-sound-pack) is a great example and starting point for creating your own asset manifest source. -Note that the repository contains a [script for generating an asset manifest](https://github.com/MozillaReality/hubs-sound-pack/blob/master/scripts/manifest-generator.js) from the repository's folder structure. It's fairly specific for this project, but you could easily adopt it for your own project. \ No newline at end of file +Note that the repository contains a [script for generating an asset manifest](https://github.com/Hubs-Foundation/hubs-sound-pack/blob/master/scripts/manifest-generator.js) from the repository's folder structure. It's fairly specific for this project, but you could easily adopt it for your own project. diff --git a/docs/creating-kits.md b/docs/creating-kits.md index 87552aa99..8cd85b871 100644 --- a/docs/creating-kits.md +++ b/docs/creating-kits.md @@ -1,8 +1,8 @@ # Creating Kits -Kits, like the [Architecture Kit](https://github.com/MozillaReality/hubs-architecture-kit) and the [Rock Kit](https://github.com/MozillaReality/hubs-rock-kit) are special asset sources in Spoke. They are intended to reduce material usage and increase our ability to combine objects before exporting. In this guide we'll go over how to create a kit using Blender, the Spoke Kit Packager, and write the code to add it to Spoke. +Kits, like the [Architecture Kit](https://github.com/Hubs-Foundation/hubs-architecture-kit) and the [Rock Kit](https://github.com/Hubs-Foundation/hubs-rock-kit) are special asset sources in Spoke. They are intended to reduce material usage and increase our ability to combine objects before exporting. In this guide we'll go over how to create a kit using Blender, the Spoke Kit Packager, and write the code to add it to Spoke. -To start out, we'll need to grab [Blender](https://www.blender.org/) and install the [Hubs Blender Exporter](https://github.com/MozillaReality/hubs-blender-exporter). Follow the guide in the Hubs Blender Exporter repository to install the addon. +To start out, we'll need to grab [Blender](https://www.blender.org/) and install the [Hubs Blender Exporter](https://github.com/Hubs-Foundation/hubs-blender-exporter). Follow the guide in the Hubs Blender Exporter repository to install the addon. Once you've got the addon set up, let's create a new Blender project. We won't be going into the details of how to model with Blender and we'll only be working with primitive shapes. diff --git a/package.json b/package.json index 6650f2e52..6fd4fdf0d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/mozilla/Spoke.git" + "url": "https://github.com/Hubs-Foundation/Spoke.git" }, "scripts": { "start": "cross-env NODE_ENV=development webpack-dev-server --mode development", @@ -102,7 +102,7 @@ "recharts": "^1.8.5", "styled-components": "4.4.0", "styled-icons": "^8.4.2", - "three": "https://github.com/MozillaReality/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f", + "three": "https://github.com/Hubs-Foundation/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f", "three-mesh-bvh": "^0.1.4", "troika-three-text": "^0.44.0", "url-toolkit": "^2.1.6", @@ -165,4 +165,4 @@ "webpack-dev-server": "^3.8.0", "worker-loader": "^2.0.0" } -} \ No newline at end of file +} diff --git a/src/api/Api.js b/src/api/Api.js index 2fade539e..a789216fc 100644 --- a/src/api/Api.js +++ b/src/api/Api.js @@ -14,7 +14,7 @@ import { matchesFileTypes, AudioFileTypes } from "../ui/assets/fileTypes"; import { RethrownError } from "../editor/utils/errors"; // Media related functions should be kept up to date with Hubs media-utils: -// https://github.com/mozilla/hubs/blob/master/src/utils/media-utils.js +// https://github.com/Hubs-Foundation/hubs/blob/master/src/utils/media-utils.js const resolveUrlCache = new Map(); const resolveMediaCache = new Map(); @@ -1020,7 +1020,7 @@ export default class Project extends EventEmitter { } async upload(blob, onUploadProgress, signal) { - // Use direct upload API, see: https://github.com/mozilla/reticulum/pull/319 + // Use direct upload API, see: https://github.com/Hubs-Foundation/reticulum/pull/319 const { phx_host: uploadHost } = await (await this.fetch(`https://${RETICULUM_SERVER}/api/v1/meta`)).json(); const uploadPort = new URL(`https://${RETICULUM_SERVER}`).port; diff --git a/src/api/AuthForm.js b/src/api/AuthForm.js index 93a5266a3..7cdbe6d65 100644 --- a/src/api/AuthForm.js +++ b/src/api/AuthForm.js @@ -95,12 +95,12 @@ export default class AuthForm extends Component { By proceeding, you agree to the{" "} - terms of use + terms of use (TBD) {" "} and{" "} - privacy notice - + privacy notice (TBD) + {" "} . diff --git a/src/api/PublishDialog.js b/src/api/PublishDialog.js index a90c858cd..9cf435f7c 100644 --- a/src/api/PublishDialog.js +++ b/src/api/PublishDialog.js @@ -75,7 +75,7 @@ export default class PublishDialog extends Component {