Skip to content

Commit

Permalink
Update URLs to MagicMirrorOrg (#3321)
Browse files Browse the repository at this point in the history
  • Loading branch information
KristjanESPERANTO authored Jan 1, 2024
1 parent 5e346e7 commit 367d02f
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 95 deletions.
134 changes: 67 additions & 67 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Collaboration.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ This document describes how collaborators of this repository should work togethe

## Releases

- are done by @MichMich only
Are done by @rejas or @khassel.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<a href="https://choosealicense.com/licenses/mit">
<img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License">
</a>
<img src="https://img.shields.io/github/actions/workflow/status/michmich/magicmirror/automated-tests.yaml" alt="GitHub Actions">
<img src="https://img.shields.io/github/checks-status/michmich/magicmirror/master" alt="Build Status">
<a href="https://github.com/MichMich/MagicMirror">
<img src="https://img.shields.io/github/stars/michmich/magicmirror?style=social">
<img src="https://img.shields.io/github/actions/workflow/status/magicmirrororg/magicmirror/automated-tests.yaml" alt="GitHub Actions">
<img src="https://img.shields.io/github/checks-status/magicmirrororg/magicmirror/master" alt="Build Status">
<a href="https://github.com/MagicMirrorOrg/MagicMirror">
<img src="https://img.shields.io/github/stars/magicmirrororg/magicmirror?style=social">
</a>
</p>

**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MagicMirrorOrg/MagicMirror/graphs/contributors).

MagicMirror² focuses on a modular plugin system and uses [Electron](https://www.electronjs.org/) as an application wrapper. So no more web server or browser installs necessary!

Expand Down
4 changes: 2 additions & 2 deletions fonts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "Package for fonts use by MagicMirror² Core.",
"repository": {
"type": "git",
"url": "git+https://github.com/MichMich/MagicMirror.git"
"url": "git+https://github.com/MagicMirrorOrg/MagicMirror.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/MichMich/MagicMirror/issues"
"url": "https://github.com/MagicMirrorOrg/MagicMirror/issues"
},
"dependencies": {
"@fontsource/roboto": "^5.0.8",
Expand Down
4 changes: 2 additions & 2 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if (process.env.MM_CONFIG_FILE) {
}

// FIXME: Hotfix Pull Request
// https://github.com/MichMich/MagicMirror/pull/673
// https://github.com/MagicMirrorOrg/MagicMirror/pull/673
if (process.env.MM_PORT) {
global.mmPort = process.env.MM_PORT;
}
Expand All @@ -40,7 +40,7 @@ process.on("uncaughtException", function (err) {
Log.error("Whoops! There was an uncaught exception...");
Log.error(err);
Log.error("MagicMirror² will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?");
Log.error("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues");
Log.error("If you think this really is an issue, please open an issue on GitHub: https://github.com/MagicMirrorOrg/MagicMirror/issues");
});

/**
Expand Down
2 changes: 1 addition & 1 deletion js/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const defaults = {
zoom: 1,
customCss: "css/custom.css",
// httpHeaders used by helmet, see https://helmetjs.github.io/. You can add other/more object values by overriding this in config.js,
// e.g. you need to add `frameguard: false` for embedding MagicMirror in another website, see https://github.com/MichMich/MagicMirror/issues/2847
// e.g. you need to add `frameguard: false` for embedding MagicMirror in another website, see https://github.com/MagicMirrorOrg/MagicMirror/issues/2847
httpHeaders: { contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, crossOriginResourcePolicy: false, originAgentCluster: false },

// properties for checking if server is alive and has same startup-timestamp, the check is per default enabled
Expand Down
4 changes: 2 additions & 2 deletions modules/default/clock/clock.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Module.register("clock", {
// Set content of wrappers.
// The moment().format("h") method has a bug on the Raspberry Pi.
// So we need to generate the timestring manually.
// See issue: https://github.com/MichMich/MagicMirror/issues/181
// See issue: https://github.com/MagicMirrorOrg/MagicMirror/issues/181
let timeString;
const now = moment();
if (this.config.timezone) {
Expand Down Expand Up @@ -247,7 +247,7 @@ Module.register("clock", {
analogWrapper.style.background = `url(${this.data.path}faces/${this.config.analogFace}.svg)`;
analogWrapper.style.backgroundSize = "100%";

// The following line solves issue: https://github.com/MichMich/MagicMirror/issues/611
// The following line solves issue: https://github.com/MagicMirrorOrg/MagicMirror/issues/611
// analogWrapper.style.border = "1px solid black";
analogWrapper.style.border = "rgba(0, 0, 0, 0.1)"; //Updated fix for Issue 611 where non-black backgrounds are used
} else if (this.config.analogFace !== "none") {
Expand Down
2 changes: 1 addition & 1 deletion modules/default/updatenotification/git_helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class GitHelper {
const { stderr } = await this.execShell(`cd ${repo.folder} && git fetch -n --dry-run`);

// example output:
// From https://github.com/MichMich/MagicMirror
// From https://github.com/MagicMirrorOrg/MagicMirror
// e40ddd4..06389e3 develop -> origin/develop
// here the result is in stderr (this is a git default, don't ask why ...)
const matches = stderr.match(this.getRefRegex(gitInfo.current));
Expand Down
2 changes: 1 addition & 1 deletion modules/default/updatenotification/updatenotification.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Module.register("updatenotification", {

const localRef = status.hash;
const remoteRef = status.tracking.replace(/.*\//, "");
return `<a href="https://github.com/MichMich/MagicMirror/compare/${localRef}...${remoteRef}" class="xsmall dimmed difflink" target="_blank">${text}</a>`;
return `<a href="https://github.com/MagicMirrorOrg/MagicMirror/compare/${localRef}...${remoteRef}" class="xsmall dimmed difflink" target="_blank">${text}</a>`;
});
},

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/MichMich/MagicMirror.git"
"url": "git+https://github.com/MagicMirrorOrg/MagicMirror.git"
},
"keywords": [
"magic mirror",
Expand All @@ -41,11 +41,11 @@
],
"author": "Michael Teeuw",
"contributors": [
"https://github.com/MichMich/MagicMirror/graphs/contributors"
"https://github.com/MagicMirrorOrg/MagicMirror/graphs/contributors"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/MichMich/MagicMirror/issues"
"url": "https://github.com/MagicMirrorOrg/MagicMirror/issues"
},
"homepage": "https://magicmirror.builders",
"devDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/functions/updatenotification_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ describe("Updatenotification", () => {
const moduleName = "MagicMirror";

beforeEach(async () => {
gitRemoteOut = "origin\[email protected]:MichMich/MagicMirror.git (fetch)\norigin\[email protected]:MichMich/MagicMirror.git (push)\n";
gitRemoteOut = "origin\[email protected]:MagicMirrorOrg/MagicMirror.git (fetch)\norigin\[email protected]:MagicMirrorOrg/MagicMirror.git (push)\n";
gitRevParseOut = "332e429a41f1a2339afd4f0ae96dd125da6beada";
gitStatusOut = "## develop...origin/develop\n M tests/unit/functions/updatenotification_spec.js\n";
gitFetchErr = "From github.com:MichMich/MagicMirror\n60e0377..332e429 develop -> origin/develop\n";
gitFetchErr = "From github.com:MagicMirrorOrg/MagicMirror\n60e0377..332e429 develop -> origin/develop\n";
gitRevListCountOut = "5";

await gitHelper.add(moduleName);
Expand Down Expand Up @@ -114,10 +114,10 @@ describe("Updatenotification", () => {
const moduleName = "MagicMirror";

beforeEach(async () => {
gitRemoteOut = "origin\[email protected]:MichMich/MagicMirror.git (fetch)\norigin\[email protected]:MichMich/MagicMirror.git (push)\n";
gitRemoteOut = "origin\[email protected]:MagicMirrorOrg/MagicMirror.git (fetch)\norigin\[email protected]:MagicMirrorOrg/MagicMirror.git (push)\n";
gitRevParseOut = "332e429a41f1a2339afd4f0ae96dd125da6beada";
gitStatusOut = "## master...origin/master\n M tests/unit/functions/updatenotification_spec.js\n";
gitFetchErr = "From github.com:MichMich/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitFetchErr = "From github.com:MagicMirrorOrg/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitRevListCountOut = "5";

await gitHelper.add(moduleName);
Expand Down Expand Up @@ -153,10 +153,10 @@ describe("Updatenotification", () => {
const moduleName = "MagicMirror";

beforeEach(async () => {
gitRemoteOut = "origin\[email protected]:MichMich/MagicMirror.git (fetch)\norigin\[email protected]:MichMich/MagicMirror.git (push)\n";
gitRemoteOut = "origin\[email protected]:MagicMirrorOrg/MagicMirror.git (fetch)\norigin\[email protected]:MagicMirrorOrg/MagicMirror.git (push)\n";
gitRevParseOut = "332e429a41f1a2339afd4f0ae96dd125da6beada";
gitStatusOut = "## master...origin/master\n M tests/unit/functions/updatenotification_spec.js\n";
gitFetchErr = "From github.com:MichMich/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitFetchErr = "From github.com:MagicMirrorOrg/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitRevListCountOut = "5";
gitTagListOut = "332e429a41f1a2339afd4f0ae96dd125da6beada...tag...\n";
gitRevListOut = "332e429a41f1a2339afd4f0ae96dd125da6beada\n";
Expand Down Expand Up @@ -194,10 +194,10 @@ describe("Updatenotification", () => {
const moduleName = "MagicMirror";

beforeEach(async () => {
gitRemoteOut = "origin\[email protected]:MichMich/MagicMirror.git (fetch)\norigin\[email protected]:MichMich/MagicMirror.git (push)\n";
gitRemoteOut = "origin\[email protected]:MagicMirrorOrg/MagicMirror.git (fetch)\norigin\[email protected]:MagicMirrorOrg/MagicMirror.git (push)\n";
gitRevParseOut = "332e429a41f1a2339afd4f0ae96dd125da6beada";
gitStatusOut = "## master...origin/master\n M tests/unit/functions/updatenotification_spec.js\n";
gitFetchErr = "From github.com:MichMich/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitFetchErr = "From github.com:MagicMirrorOrg/MagicMirror\n60e0377..332e429 master -> origin/master\n";
gitRevListCountOut = "5";
gitTagListOut = "xxxe429a41f1a2339afd4f0ae96dd125da6beada...tag...\n";
gitRevListOut = "332e429a41f1a2339afd4f0ae96dd125da6beada\n";
Expand Down
4 changes: 2 additions & 2 deletions vendor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "Package for vendors use by MagicMirror² Core.",
"repository": {
"type": "git",
"url": "git+https://github.com/MichMich/MagicMirror.git"
"url": "git+https://github.com/MagicMirrorOrg/MagicMirror.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/MichMich/MagicMirror/issues"
"url": "https://github.com/MagicMirrorOrg/MagicMirror/issues"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.5.1",
Expand Down

0 comments on commit 367d02f

Please sign in to comment.