Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging down from source #1

Merged
merged 2,252 commits into from
Jan 4, 2019
Merged

Merging down from source #1

merged 2,252 commits into from
Jan 4, 2019

Conversation

chrisotto6
Copy link
Owner

No description provided.

parnic and others added 30 commits May 5, 2018 08:31
@parnic
Fixed coloredSymbolOnly
173499f
@MichMich
Merge pull request #1279 from parnic/develop
cfb39c6 
Fixed coloredSymbolOnly
@jannekalliola
Changed weatherforecast to use dt_txt field
0e2e8d2
@MichMich
Merge pull request #1283 from jannekalliola/develop
1eaa9d3 
Changed weatherforecast to use dt_txt field
New calendar display format with date headers for days and times list…
94c46f9 
…ed next to events for that date

IE:

Sunday, May 1st
  2:00 pm       Soccer
  4:00 pm       Basketball
fix missing s on timeFormat
e492012
fix linting errors. add line to changelog
c6bf69c
@MichMich
Merge pull request #1284 from jrlambs/develop
df86e59 
New calendar display format
@MichMich
Upgrade to Electron 2.0.0.
889af46
@ringzer
Update README.md
788f1c4 
Included /home/pi/MagicMirror/ path when copying config.js.sample and running npm run config:check
@MichMich
Merge pull request #1287 from ringzer/patch-1
349af24 
Update README.md
@edward-shen
Fixes #1282.
55a161f 
Added a runtime var isShowingDescription that gets reset to user config.
this.config.showDescription no longer mutates during runtime.
Changelog has been updated to include this fix.
@MichMich
Merge pull request #1290 from edward-shen/develop
3049ba0 
newsfeed now remembers user configuration settings for descriptions after fullscreen view. Fixes #1282.
@fewieden
fix moment, add unit filter
91ddc00
@fewieden
start with forecast template
3341c9e
@MichMich
Add information about the Electron update.
0e030f7
@EtzBetz
Add note to README.md
091e024 
Add note to README.md to not add calendars that have entries before 1st January 1970.
@MichMich
Merge pull request #1293 from derRAV3N/patch-1
c4dee3d 
Add note to README.md
add and lint clientonly
b44fbc1
Changelog
afea33b
Merge branch 'develop' into linting-fix
de8e5b2
@MichMich
Merge pull request #1297 from OiYouYeahYou/linting-fix
3b7b74a 
Add and lint clientonly/index.js
@idoodler
Ability to fetch compliments from a remote server
b140ef3
@MichMich
Merge pull request #1302 from idoodler/develop
e408737 
Ability to fetch compliments from a remote server
@kjb085
Add regex filtering to calendar module
70dccff
@MichMich
Merge pull request #1304 from kjb085/kb/calendar-regex
d47cfe9 
Add regex filtering to calendar module
@sdetweil
invoke callback for suspend notification, even if no dom content
848f94b
@sdetweil
fix tabs
11238d6
@sdetweil
update changelog
1813562
@sdetweil
fix changelog
c3f03e3
fewieden and others added 29 commits December 27, 2018 17:13
@fewieden
weatherprovider
6383618
@fewieden
small improvements
ebee80d
@fewieden
forecast
95adc0a
@fewieden
darksky forecast and darksky current weather fixes
0ed2ba0
@fewieden
config options and documentation
1920f81
@fewieden
cleanup
10bc326
@fewieden
Merge branch 'develop' of https://github.com/MichMich/MagicMirror int…
7a0bc81 
…o weather

# Conflicts:
#	css/main.css
@fewieden
Add changelog entry
b853c00
@MichMich
Merge pull request #1488 from fewieden/weather
b94dc50 
Weather refactoring
@fewieden
add unit and language handling for weather provider darksky
8a65bef
@devpwnz
Update ro.json
8e28be6
@devpwnz
Update CHANGELOG.md
39994d5
@MichMich
Merge pull request #1489 from fewieden/feature/weather-module-improve…
b9f75bf 
…ments

WIP: weather module improvements
@MichMich
Merge pull request #1491 from devpwnz/patch-1
28a108f 
Update ro.json
@fewieden
fixed darksky metric units
cc274ff
@fewieden
fixed beaufortwindspeed for imperial units
88d8623
@fewieden
add original feels like temperature and fixed it for imperial units
8dd7621
@MichMich
Merge pull request #1495 from fewieden/feature/weather-module-improve…
986337d 
…ments

weather module feels like temperature
@MichMich
Merge pull request #1485 from djgalloway/wip-endtime
ed617c5 
Document endTime variables
@janfrode
Update README.md
38fb53b 
Wrong delimiter used for electronOptions. Use : instead of =.
@fewieden
fix rain amount information for different units and providers, docume…
de04c12 
…ntation
@fewieden
link provider readme in module readme
40a30c2
@MichMich
Merge pull request #1496 from janfrode/patch-1
de06490 
Update README.md
@MichMich
Merge pull request #1497 from fewieden/feature/weather-module-improve…
7e69fa3 
…ments

fix rain amount information for different units and providers, docume…
@MichMich
Prepare for release 2.6.0.
b33663c
@MichMich
Upgrade Electron to 2.0.16
874d79b
@MichMich
Additional update info.
99febb9
@MichMich
Add dependency.
e70e011
@MichMich
Merge pull request #1498 from MichMich/develop
de57daa 
Release 2.6.0.
@chrisotto6 chrisotto6 merged commit d30af06 into chrisotto6:master Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.