kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into cleanups

Browse Source
This commit is contained in:
Veeck 2017-06-11 11:29:19 +02:00
commit 53476b723d
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ before_script:
- sleep 5 - sleep 5
script: script:
- grunt - grunt
- npm test - npm run test:unit
cache: cache:
directories: directories:
- node_modules - node_modules

2
CHANGELOG.md
View File

@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add test for check if exits the directories present in defaults modules. - Add test for check if exits the directories present in defaults modules.
- Add calendar option to set a separate date format for full day events. - Add calendar option to set a separate date format for full day events.
- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
- Add ability to change the path of the `custom.css`.
### Updated ### Updated
- Added missing keys to Polish translation. - Added missing keys to Polish translation.
@ -33,6 +34,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix instruction in README for using automatically installer script. - Fix instruction in README for using automatically installer script.
- Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments). - Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments).
- Fix double message about port when server is starting - Fix double message about port when server is starting
- Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
## [2.1.1] - 2017-04-01 ## [2.1.1] - 2017-04-01

2
README.md
View File

@ -124,7 +124,7 @@ The following properties can be configured:
| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. | | `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** | | `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). | | `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
Module configuration: Module configuration:

1
js/defaults.js
View File

@ -21,6 +21,7 @@ var defaults = {
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",
zoom: 1, zoom: 1,
customCss: "css/custom.css",
modules: [ modules: [
{ {

2
js/loader.js
View File

@ -35,7 +35,7 @@ var Loader = (function() {
// This is done after all the modules so we can // This is done after all the modules so we can
// overwrite all the defined styles. // overwrite all the defined styles.
loadFile("css/custom.css", function() { loadFile(config.customCss, function() {
// custom.css loaded. Start all modules. // custom.css loaded. Start all modules.
startModules(); startModules();
}); });

6
translations/sv.json
View File

@ -1,9 +1,9 @@
{ {
"LOADING": "Laddar …", "LOADING": "Laddar …",
"TODAY": "Idag", "TODAY": "I dag",
"TOMORROW": "Imorgon", "TOMORROW": "I morgon",
"DAYAFTERTOMORROW": "Iövermorgon", "DAYAFTERTOMORROW": "I övermorgon",
"RUNNING": "Slutar", "RUNNING": "Slutar",
"EMPTY": "Inga kommande händelser.", "EMPTY": "Inga kommande händelser.",