Skip to content

Commit 4a579fb

Browse files
khasselcrazyscotbugsounetKristjanESPERANTOrejas
authored
Release v2.32.0 (#317)
* weather.md: update for recent changes (#230) * add updates feature configuration (#234) * Update calendar.md (#236) * updateOnFetch feature Docs (#235) * Minor changes (#238) * Minor changes - wording - Magic Mirror -> MagicMirror - format * sh -> shell * Update compliments docs page (#242) Add documentation for the specialDayUnique config option * Cleanup formatting (#247) * bump prettier * run prettier * UK Met Office Documentation Fix (#253) * Update weather.md Updated documentation for MetOffice update * Update weather.md * add doc for new compliments(#3481) and support custom positions (#3518) (#254) * add doc for new compliments(#3481) and support custom positions (#3518) * fix typo * update compliments, and module position info (#255) * add doc for new compliments(#3481) and support custom positions (#3518) * fix typo * Added docs for new notification `MODULE_DOM_UPDATED` (#262) * Bump send and express (#260) Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `send` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/pillarjs/send/releases) - [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md) - [Commits](pillarjs/send@0.18.0...0.19.0) Updates `express` from 4.20.0 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](expressjs/express@4.20.0...4.21.0) --- updated-dependencies: - dependency-name: send dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Added docs for new notification - . Fixes #261 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Windows section and add Wayland section (#265) According to the changes in PR MagicMirrorOrg/MagicMirror#3594. * add clarification for nextDaysRelative and showEndsOnlyWithDuration, … (#268) * add clarification for nextDaysRelative and showEndsOnlyWithDuration, only apply to full day events * add emphasis for PREVENT on showEndsOnlyWithDuration * electron-rebuild -> @electron/rebuild (#271) electron-rebuild has been deprecated. * update doc for #3630 (#273) * fix typos, add doc for calendar FullDateEnd format usage, add new env for fetch timeout (#277) * fix typos, add doc for calendar FullDateEnd format usage, add new env variable for fetch timeout * bump deps * lint docs * fix typo --------- Co-authored-by: veeck <[email protected]> * prepare release 2.31.0 * Upgrade to Vuepress2 (#214) * Start migrating to v2 * Make CarbonAds work again * Remove dead files and cleanups * Bump vue * Bump to rc2 * Bump to rc8 * Bump to rc9 * Add logo, remove contributor list * Bump to rc11 * Fix menu * Bump to rec12 * Bump to rc14 * bump dependencies * bump dependencies * bump to rc19 --------- Co-authored-by: veeck <[email protected]> * fix and update dependencies * update package-lock.json * Final cleanups (#287) * remove yarn lock * add discord link * bump deps * add alt text --------- Co-authored-by: veeck <[email protected]> * newsfeed: add new properties for feeds (#294) see MagicMirrorOrg/MagicMirror#3742 * [updatenotification] Added option to iterate over modules directory instead using modules defined in `config.js`, doc for MagicMirrorOrg/MagicMirror#3755 (#295) * add info for clock css and deprecated property, clarify property use for calendar (pastDaysCount) (#292) * Update weather.md (#281) * Cleanups (#297) * update deps * run linter * bump rc deps --------- Co-authored-by: veeck <[email protected]> * Add documentation for disableNextEvent (#307) * Update clock.md * Add documentation for disableNextEvent (#307) * Update clock.md * Update clock.md * Update clock.md (#309) * fix compliments option table (#300) Co-authored-by: veeck <[email protected]> * Bump vite from 6.1.3 to 6.1.4 (#302) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.3 to 6.1.4. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v6.1.4/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.1.4/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * replace `npm start` with `npm run start` (#304) * Bump vite from 6.1.4 to 6.1.5 (#305) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.4 to 6.1.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v6.1.5/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.1.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependencies (#306) * bump dependencies * run linter --------- Co-authored-by: veeck <[email protected]> * Bump vite from 6.2.6 to 6.2.7 (#308) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.6 to 6.2.7. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v6.2.7/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.2.7/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.2.7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * changes after removal of dirs fonts and vendor, remove unneeded ignorePaths from cspell.config.json (#310) * docs: reword windows part and move it from "Installation" to "Usage" section (#310) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Ross Younger <[email protected]> Co-authored-by: Bugsounet - Cédric <[email protected]> Co-authored-by: Kristjan ESPERANTO <[email protected]> Co-authored-by: veeck <[email protected]> Co-authored-by: WallysWellies <[email protected]> Co-authored-by: Veeck <[email protected]> Co-authored-by: jargordon <[email protected]> Co-authored-by: sam detweiler <[email protected]> Co-authored-by: Ryan Williams <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: veeck <[email protected]> Co-authored-by: Maxwell <[email protected]> Co-authored-by: BugHaver <[email protected]>
1 parent 691533a commit 4a579fb

File tree

4 files changed

+21
-47
lines changed

4 files changed

+21
-47
lines changed

‎cspell.config.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,7 @@
3333
"yourprovider"
3434
],
3535
"ignorePaths": [
36-
"node_modules/**",
37-
"modules/**",
38-
"vendor/node_modules/**",
39-
"translations/**",
40-
"tests/mocks/**",
41-
"tests/e2e/modules/clock_es_spec.js",
42-
"fonts/roboto.css"
36+
"node_modules/**"
4337
],
4438
"dictionaries": ["node"]
4539
}

‎development/core-module-file.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ The getScripts method is called to request any additional scripts that need to
127127
be loaded. This method should therefore return an array with strings. If you
128128
want to return a full path to a file in the module folder, use the
129129
`this.file('filename.js')` method. In all cases the loader will only load a file
130-
once. It even checks if the file is available in the default vendor folder.
130+
once. It even checks the files defined in `js/vendor.js`.
131131

132132
**Example:**
133133

134134
```javascript
135135
getScripts: function() {
136136
return [
137-
'script.js', // will try to load it from the vendor folder, otherwise it will load is from the module folder.
138-
'moment.js', // this file is available in the vendor folder, so it doesn't need to be available in the module folder.
137+
'script.js', // will try to load it from the files defined in `js/vendor.js`, otherwise it will load it from the module folder.
138+
'moment.js', // this file is defined in `js/vendor.js`, so it doesn't need to be available in the module folder.
139139
this.file('another_file.js'), // this file will be loaded straight from the module folder.
140140
'https://code.jquery.com/jquery-2.2.3.min.js', // this file will be loaded from the jquery servers.
141141
]
@@ -154,15 +154,15 @@ The getStyles method is called to request any additional stylesheets that need
154154
to be loaded. This method should therefore return an array with strings. If you
155155
want to return a full path to a file in the module folder, use the
156156
`this.file('filename.css')` method. In all cases the loader will only load a
157-
file once. It even checks if the file is available in the default vendor folder.
157+
file once. It even checks the files defined in `js/vendor.js`.
158158

159159
**Example:**
160160

161161
```javascript
162162
getStyles: function() {
163163
return [
164-
'script.css', // will try to load it from the vendor folder, otherwise it will load is from the module folder.
165-
'font-awesome.css', // this file is available in the vendor folder, so it doesn't need to be available in the module folder.
164+
'script.css', // will try to load it from the files defined in `js/vendor.js`, otherwise it will load it from the module folder.
165+
'font-awesome.css', // this file is defined in `js/vendor.js`, so it doesn't need to be available in the module folder.
166166
this.file('another_file.css'), // this file will be loaded straight from the module folder.
167167
'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css', // this file will be loaded from the bootstrap cdn servers.
168168
]

‎getting-started/installation.md‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -78,38 +78,6 @@ team. Use these scripts and methods at your own risk.
7878
- We also publish the latest version of MagicMirror to the
7979
[npm-registry](https://www.npmjs.com/package/magicmirror).
8080

81-
## Other Operating Systems
82-
83-
### Windows
84-
85-
::: warning IMPORTANT
86-
87-
MagicMirror² is designed to run on Linux. But with an extra step in the
88-
installation process and a different start command, you can also run it on
89-
Windows. Some third-party modules may not work on Windows.
90-
91-
:::
92-
93-
To get the software running on Windows, you have to do two things in addition to
94-
the [steps](#manual-installation) above:
95-
96-
**After step 5:** Install dependencies in the vendor and font directories:
97-
98-
Powershell:
99-
100-
1. `cd fonts; npm install; cd ..`
101-
2. `cd vendor; npm install; cd ..`
102-
103-
Command Prompt:
104-
105-
1. `cd fonts && npm install && cd ..`
106-
2. `cd vendor && npm install && cd ..`
107-
108-
Otherwise the screen will stay black when starting the software.
109-
110-
**Step 7:** In Windows you must use `npm run start:windows` instead of
111-
`npm run start`.
112-
11381
## Usage
11482

11583
Note the following:
@@ -161,3 +129,15 @@ port number of the server)
161129

162130
If you use Wayland. Run `npm run start:wayland` instead of `npm run start` to
163131
start.
132+
133+
### Windows
134+
135+
::: warning IMPORTANT
136+
137+
MagicMirror² is designed to run on Linux. But with a different start command,
138+
you can also run it on Windows. Some third-party modules may not work on Windows.
139+
140+
:::
141+
142+
In Windows you must use `npm run start:windows` instead of
143+
`npm run start`.

‎modules/clock.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ The following properties can be configured:
3838
| `clockBold` | Remove the colon and bold the minutes to make a more modern look. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` |
3939
| `showTime` | Turn off or on the Time section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true` |
4040
| `showDate` | Turn off or on the Date section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true` |
41-
| `showWeek` | Turn off or on the Week section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` |
42-
| `showSunTimes` | Turn off or on the section showing sunrise and sunset times (digital clock only). <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` |
41+
| `showWeek` | Turn off or on the Week section. <br><br> **Possible values:** `true`, `false` or `short` <br> **Default value:** `false` |
42+
| `showSunTimes` | Turn off or on the section showing sunrise and sunset times (digital clock only). <br><br> **Possible values:** `true`, `false` or `disableNextEvent` <br> **Default value:** `false` |
4343
| `showMoonTimes` | Turn off or on the section showing moonrise and moonset times (digital clock only). Optionally display an image of lunar phase and lit percentage of the moon<br><br> **Possible values:** `times`, `percent`, `phase`, `both` or `false` (disable) <br> **Default value:** `false` |
4444
| `lat` | Latitude for sun/moon calculations. <br><br> **Default value:** `47.630539` |
4545
| `lon` | Longitude for sun/moon calculations. <br><br> **Default value:** `-122.344147` |

0 commit comments

Comments
 (0)