API tools faq
paste
Advertisement
kellogg76

Untitled

kellogg76
May 24th, 2017
227
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.58 KB | None | 0 0
raw download clone embed print report
  1. Updating 8010e62..5c41e24
  2. Fast-forward
  3. .dockerignore | 72 +
  4. .eslintignore | 4 +-
  5. .github/PULL_REQUEST_TEMPLATE.md | 7 +
  6. .gitignore | 3 +-
  7. .travis.yml | 11 +-
  8. CHANGELOG.md | 76 +-
  9. Dockerfile | 19 +
  10. Gruntfile.js | 11 +-
  11. LICENSE.md | 2 +-
  12. README.md | 47 +-
  13. config/config.js.sample | 54 +-
  14. css/main.css | 12 +
  15. docker-entrypoint.sh | 11 +
  16. index.html | 8 +-
  17. installers/mm.sh | 2 +
  18. installers/pm2_MagicMirror.json | 7 +
  19. installers/postinstall/postinstall.sh | 2 +
  20. installers/raspberry.sh | 35 +-
  21. js/app.js | 103 +-
  22. js/defaults.js | 6 +-
  23. js/deprecated.js | 14 +
  24. js/electron.js | 3 +-
  25. js/loader.js | 10 +
  26. js/main.js | 52 +-
  27. js/module.js | 53 +-
  28. js/server.js | 33 +-
  29. js/utils.js | 18 +
  30. modules/README.md | 15 +
  31. modules/default/alert/README.md | 149 +-
  32. modules/default/alert/translations/hu.json | 4 +
  33. modules/default/alert/translations/ru.json | 4 +
  34. modules/default/calendar/README.md | 234 +-
  35. modules/default/calendar/calendar.js | 148 +-
  36. modules/default/calendar/calendarfetcher.js | 34 +-
  37. modules/default/calendar/debug.js | 14 +-
  38. modules/default/calendar/node_helper.js | 7 +-
  39. modules/default/calendar/vendor/ical.js/ical.js | 12 +-
  40. modules/default/calendar/vendor/ical.js/node-ical.js | 13 +-
  41. modules/default/clock/README.md | 124 +-
  42. modules/default/clock/clock.js | 77 +-
  43. modules/default/compliments/README.md | 116 +-
  44. modules/default/compliments/compliments.js | 21 +-
  45. modules/default/currentweather/README.md | 246 +-
  46. modules/default/currentweather/currentweather.js | 24 +-
  47. modules/default/helloworld/README.md | 29 +-
  48. modules/default/newsfeed/README.md | 189 +-
  49. modules/default/newsfeed/fetcher.js | 7 +-
  50. modules/default/newsfeed/newsfeed.js | 113 +-
  51. modules/default/newsfeed/node_helper.js | 11 +-
  52. modules/default/updatenotification/README.md | 25 +-
  53. modules/default/weatherforecast/README.md | 223 +-
  54. modules/default/weatherforecast/weatherforecast.css | 8 +
  55. modules/default/weatherforecast/weatherforecast.js | 14 +-
  56. modules/node_modules/node_helper/index.js | 9 +-
  57. package.json | 22 +-
  58. run-start.sh | 4 +
  59. splashscreen/MagicMirror.script | 17 +-
  60. splashscreen/splash.png | Bin 19820 -> 37062 bytes
  61. splashscreen/splash_halt.png | Bin 0 -> 22304 bytes
  62. tests/configs/data/calendar_test.ics | 190 ++
  63. tests/configs/empty_ipWhiteList.js | 25 +
  64. tests/configs/env.js | 25 +
  65. tests/configs/modules/calendar/auth-default.js | 41 +
  66. tests/configs/modules/calendar/basic-auth.js | 42 +
  67. tests/configs/modules/calendar/default.js | 37 +
  68. tests/configs/modules/calendar/fail-basic-auth.js | 44 +
  69. tests/configs/modules/calendar/old-basic-auth.js | 39 +
  70. tests/configs/modules/clock/clock_12hr.js | 29 +
  71. tests/configs/modules/clock/clock_24hr.js | 29 +
  72. tests/configs/modules/clock/clock_displaySeconds_false.js | 32 +
  73. tests/configs/modules/clock/clock_showPeriodUpper.js | 32 +
  74. tests/configs/modules/clock/clock_showWeek.js | 32 +
  75. tests/configs/modules/clock/es/clock_12hr.js | 29 +
  76. tests/configs/modules/clock/es/clock_24hr.js | 29 +
  77. tests/configs/modules/clock/es/clock_showPeriodUpper.js | 32 +
  78. tests/configs/modules/compliments/compliments_anytime.js | 38 +
  79. tests/configs/modules/compliments/compliments_only_anytime.js | 35 +
  80. tests/configs/modules/compliments/compliments_parts_day.js | 42 +
  81. tests/configs/modules/helloworld/helloworld.js | 32 +
  82. tests/configs/modules/positions.js | 43 +
  83. tests/configs/noIpWhiteList.js | 25 +
  84. tests/configs/port_8090.js | 25 +
  85. tests/configs/without_modules.js | 23 +
  86. tests/e2e/dev_console.js | 51 +
  87. tests/e2e/env_spec.js | 47 +
  88. tests/e2e/global-setup.js | 34 +
  89. tests/e2e/ipWhistlist_spec.js | 46 +
  90. tests/e2e/modules/calendar_spec.js | 81 +
  91. tests/e2e/modules/clock_es_spec.js | 81 +
  92. tests/e2e/modules/clock_spec.js | 124 +
  93. tests/e2e/modules/compliments_spec.js | 95 +
  94. tests/e2e/modules/helloworld_spec.js | 24 +
  95. tests/e2e/modules_position_spec.js | 42 +
  96. tests/e2e/port_config.js | 51 +
  97. tests/e2e/without_modules.js | 53 +
  98. tests/servers/basic-auth.js | 30 +
  99. tests/unit/functions/cmp_versions_spec.js | 20 +
  100. tests/unit/global_vars/root_path_spec.js | 71 +
  101. tests/unit/translations/same_keys.js | 115 +
  102. translations/af.json | 30 +
  103. translations/da.json | 6 +-
  104. translations/de.json | 4 -
  105. translations/en.json | 6 +-
  106. translations/es.json | 6 +-
  107. translations/et.json | 30 +
  108. translations/fi.json | 9 +-
  109. translations/fr.json | 3 -
  110. translations/fy.json | 3 -
  111. translations/gr.json | 3 -
  112. translations/hu.json | 30 +
  113. translations/id.json | 30 +
  114. translations/is.json | 30 +
  115. translations/it.json | 3 -
  116. translations/ja.json | 5 +-
  117. translations/kr.json | 30 +
  118. translations/nb.json | 10 +-
  119. translations/nl.json | 4 -
  120. translations/nn.json | 10 +-
  121. translations/pl.json | 10 +-
  122. translations/pt.json | 11 +-
  123. translations/pt_br.json | 3 -
  124. translations/ru.json | 30 +
  125. translations/sv.json | 12 +-
  126. translations/tr.json | 3 -
  127. translations/translations.js | 9 +
  128. translations/zh_cn.json | 10 +-
  129. translations/zh_tw.json | 3 -
  130. vendor/font-awesome-4.5.0/HELP-US-OUT.txt | 7 -
  131. vendor/font-awesome-4.5.0/css/font-awesome.css | 2086 --------------
  132. vendor/font-awesome-4.5.0/css/font-awesome.min.css | 4 -
  133. vendor/font-awesome-4.5.0/fonts/FontAwesome.otf | Bin 109688 -> 0 bytes
  134. vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.eot | Bin 70807 -> 0 bytes
  135. vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.svg | 655 -----
  136. vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf | Bin 142072 -> 0 bytes
  137. vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff | Bin 83588 -> 0 bytes
  138. vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 | Bin 66624 -> 0 bytes
  139. vendor/font-awesome-4.5.0/less/animated.less | 34 -
  140. vendor/font-awesome-4.5.0/less/bordered-pulled.less | 25 -
  141. vendor/font-awesome-4.5.0/less/core.less | 12 -
  142. vendor/font-awesome-4.5.0/less/fixed-width.less | 6 -
  143. vendor/font-awesome-4.5.0/less/font-awesome.less | 17 -
  144. vendor/font-awesome-4.5.0/less/icons.less | 697 -----
  145. vendor/font-awesome-4.5.0/less/larger.less | 13 -
  146. vendor/font-awesome-4.5.0/less/list.less | 19 -
  147. vendor/font-awesome-4.5.0/less/mixins.less | 26 -
  148. vendor/font-awesome-4.5.0/less/path.less | 15 -
  149. vendor/font-awesome-4.5.0/less/rotated-flipped.less | 20 -
  150. vendor/font-awesome-4.5.0/less/stacked.less | 20 -
  151. vendor/font-awesome-4.5.0/less/variables.less | 708 -----
  152. vendor/font-awesome-4.5.0/scss/_animated.scss | 34 -
  153. vendor/font-awesome-4.5.0/scss/_bordered-pulled.scss | 25 -
  154. vendor/font-awesome-4.5.0/scss/_core.scss | 12 -
  155. vendor/font-awesome-4.5.0/scss/_fixed-width.scss | 6 -
  156. vendor/font-awesome-4.5.0/scss/_icons.scss | 697 -----
  157. vendor/font-awesome-4.5.0/scss/_larger.scss | 13 -
  158. vendor/font-awesome-4.5.0/scss/_list.scss | 19 -
  159. vendor/font-awesome-4.5.0/scss/_mixins.scss | 26 -
  160. vendor/font-awesome-4.5.0/scss/_path.scss | 15 -
  161. vendor/font-awesome-4.5.0/scss/_rotated-flipped.scss | 20 -
  162. vendor/font-awesome-4.5.0/scss/_stacked.scss | 20 -
  163. vendor/font-awesome-4.5.0/scss/_variables.scss | 708 -----
  164. vendor/font-awesome-4.5.0/scss/font-awesome.scss | 17 -
  165. vendor/moment/moment-timezone.js | 1197 --------
  166. vendor/moment/moment-with-locales.js | 12061 -----------------------------------------------------------------------------
  167. vendor/moment/moment-with-locales.min.js | 75 -
  168. vendor/package.json | 18 +
  169. vendor/vendor.js | 10 +-
  170. vendor/weather-icons/css/weather-icons-wind.css | 5331 ----------------------------------
  171. vendor/weather-icons/css/weather-icons-wind.min.css | 1 -
  172. vendor/weather-icons/css/weather-icons.css | 1838 ------------
  173. vendor/weather-icons/css/weather-icons.min.css | 41 -
  174. vendor/weather-icons/font/weathericons-regular-webfont.eot | Bin 99774 -> 0 bytes
  175. vendor/weather-icons/font/weathericons-regular-webfont.svg | 257 --
  176. vendor/weather-icons/font/weathericons-regular-webfont.ttf | Bin 99564 -> 0 bytes
  177. vendor/weather-icons/font/weathericons-regular-webfont.woff | Bin 56468 -> 0 bytes
  178. vendor/weather-icons/font/weathericons-regular-webfont.woff2 | Bin 44720 -> 0 bytes
  179. 176 files changed, 3471 insertions(+), 28180 deletions(-)
  180. create mode 100644 .dockerignore
  181. create mode 100644 Dockerfile
  182. create mode 100644 docker-entrypoint.sh
  183. create mode 100755 installers/mm.sh
  184. create mode 100644 installers/pm2_MagicMirror.json
  185. create mode 100644 installers/postinstall/postinstall.sh
  186. create mode 100644 js/deprecated.js
  187. create mode 100644 js/utils.js
  188. create mode 100644 modules/default/alert/translations/hu.json
  189. create mode 100644 modules/default/alert/translations/ru.json
  190. create mode 100644 run-start.sh
  191. create mode 100644 splashscreen/splash_halt.png
  192. create mode 100644 tests/configs/data/calendar_test.ics
  193. create mode 100644 tests/configs/empty_ipWhiteList.js
  194. create mode 100644 tests/configs/env.js
  195. create mode 100644 tests/configs/modules/calendar/auth-default.js
  196. create mode 100644 tests/configs/modules/calendar/basic-auth.js
  197. create mode 100644 tests/configs/modules/calendar/default.js
  198. create mode 100644 tests/configs/modules/calendar/fail-basic-auth.js
  199. create mode 100644 tests/configs/modules/calendar/old-basic-auth.js
  200. create mode 100644 tests/configs/modules/clock/clock_12hr.js
  201. create mode 100644 tests/configs/modules/clock/clock_24hr.js
  202. create mode 100644 tests/configs/modules/clock/clock_displaySeconds_false.js
  203. create mode 100644 tests/configs/modules/clock/clock_showPeriodUpper.js
  204. create mode 100644 tests/configs/modules/clock/clock_showWeek.js
  205. create mode 100644 tests/configs/modules/clock/es/clock_12hr.js
  206. create mode 100644 tests/configs/modules/clock/es/clock_24hr.js
  207. create mode 100644 tests/configs/modules/clock/es/clock_showPeriodUpper.js
  208. create mode 100644 tests/configs/modules/compliments/compliments_anytime.js
  209. create mode 100644 tests/configs/modules/compliments/compliments_only_anytime.js
  210. create mode 100644 tests/configs/modules/compliments/compliments_parts_day.js
  211. create mode 100644 tests/configs/modules/helloworld/helloworld.js
  212. create mode 100644 tests/configs/modules/positions.js
  213. create mode 100644 tests/configs/noIpWhiteList.js
  214. create mode 100644 tests/configs/port_8090.js
  215. create mode 100644 tests/configs/without_modules.js
  216. create mode 100644 tests/e2e/dev_console.js
  217. create mode 100644 tests/e2e/env_spec.js
  218. create mode 100644 tests/e2e/global-setup.js
  219. create mode 100644 tests/e2e/ipWhistlist_spec.js
  220. create mode 100644 tests/e2e/modules/calendar_spec.js
  221. create mode 100644 tests/e2e/modules/clock_es_spec.js
  222. create mode 100644 tests/e2e/modules/clock_spec.js
  223. create mode 100644 tests/e2e/modules/compliments_spec.js
  224. create mode 100644 tests/e2e/modules/helloworld_spec.js
  225. create mode 100644 tests/e2e/modules_position_spec.js
  226. create mode 100644 tests/e2e/port_config.js
  227. create mode 100644 tests/e2e/without_modules.js
  228. create mode 100644 tests/servers/basic-auth.js
  229. create mode 100644 tests/unit/functions/cmp_versions_spec.js
  230. create mode 100644 tests/unit/global_vars/root_path_spec.js
  231. create mode 100644 tests/unit/translations/same_keys.js
  232. create mode 100644 translations/af.json
  233. create mode 100644 translations/et.json
  234. create mode 100644 translations/hu.json
  235. create mode 100644 translations/id.json
  236. create mode 100644 translations/is.json
  237. create mode 100644 translations/kr.json
  238. create mode 100644 translations/ru.json
  239. delete mode 100644 vendor/font-awesome-4.5.0/HELP-US-OUT.txt
  240. delete mode 100644 vendor/font-awesome-4.5.0/css/font-awesome.css
  241. delete mode 100644 vendor/font-awesome-4.5.0/css/font-awesome.min.css
  242. delete mode 100644 vendor/font-awesome-4.5.0/fonts/FontAwesome.otf
  243. delete mode 100644 vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
  244. delete mode 100644 vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
  245. delete mode 100644 vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
  246. delete mode 100644 vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
  247. delete mode 100644 vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
  248. delete mode 100644 vendor/font-awesome-4.5.0/less/animated.less
  249. delete mode 100644 vendor/font-awesome-4.5.0/less/bordered-pulled.less
  250. delete mode 100644 vendor/font-awesome-4.5.0/less/core.less
  251. delete mode 100644 vendor/font-awesome-4.5.0/less/fixed-width.less
  252. delete mode 100644 vendor/font-awesome-4.5.0/less/font-awesome.less
  253. delete mode 100644 vendor/font-awesome-4.5.0/less/icons.less
  254. delete mode 100644 vendor/font-awesome-4.5.0/less/larger.less
  255. delete mode 100644 vendor/font-awesome-4.5.0/less/list.less
  256. delete mode 100644 vendor/font-awesome-4.5.0/less/mixins.less
  257. delete mode 100644 vendor/font-awesome-4.5.0/less/path.less
  258. delete mode 100644 vendor/font-awesome-4.5.0/less/rotated-flipped.less
  259. delete mode 100644 vendor/font-awesome-4.5.0/less/stacked.less
  260. delete mode 100644 vendor/font-awesome-4.5.0/less/variables.less
  261. delete mode 100644 vendor/font-awesome-4.5.0/scss/_animated.scss
  262. delete mode 100644 vendor/font-awesome-4.5.0/scss/_bordered-pulled.scss
  263. delete mode 100644 vendor/font-awesome-4.5.0/scss/_core.scss
  264. delete mode 100644 vendor/font-awesome-4.5.0/scss/_fixed-width.scss
  265. delete mode 100644 vendor/font-awesome-4.5.0/scss/_icons.scss
  266. delete mode 100644 vendor/font-awesome-4.5.0/scss/_larger.scss
  267. delete mode 100644 vendor/font-awesome-4.5.0/scss/_list.scss
  268. delete mode 100644 vendor/font-awesome-4.5.0/scss/_mixins.scss
  269. delete mode 100644 vendor/font-awesome-4.5.0/scss/_path.scss
  270. delete mode 100644 vendor/font-awesome-4.5.0/scss/_rotated-flipped.scss
  271. delete mode 100644 vendor/font-awesome-4.5.0/scss/_stacked.scss
  272. delete mode 100644 vendor/font-awesome-4.5.0/scss/_variables.scss
  273. delete mode 100644 vendor/font-awesome-4.5.0/scss/font-awesome.scss
  274. delete mode 100644 vendor/moment/moment-timezone.js
  275. delete mode 100644 vendor/moment/moment-with-locales.js
  276. delete mode 100644 vendor/moment/moment-with-locales.min.js
  277. create mode 100644 vendor/package.json
  278. delete mode 100644 vendor/weather-icons/css/weather-icons-wind.css
  279. delete mode 100644 vendor/weather-icons/css/weather-icons-wind.min.css
  280. delete mode 100644 vendor/weather-icons/css/weather-icons.css
  281. delete mode 100644 vendor/weather-icons/css/weather-icons.min.css
  282. delete mode 100755 vendor/weather-icons/font/weathericons-regular-webfont.eot
  283. delete mode 100755 vendor/weather-icons/font/weathericons-regular-webfont.svg
  284. delete mode 100755 vendor/weather-icons/font/weathericons-regular-webfont.ttf
  285. delete mode 100755 vendor/weather-icons/font/weathericons-regular-webfont.woff
  286. delete mode 100755 vendor/weather-icons/font/weathericons-regular-webfont.woff2
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!