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

release v2.18.0 #2761

Merged
merged 132 commits into from
Jan 1, 2022
Merged

release v2.18.0 #2761

merged 132 commits into from
Jan 1, 2022

Conversation

MichMich
Copy link
Collaborator

@MichMich MichMich commented Jan 1, 2022

Hello and thank you for wanting to contribute to the MagicMirror project

Please make sure that you have followed these 4 rules before submitting your Pull Request:

  1. Base your pull requests against the develop branch.

  2. Include these infos in the description:

  • Does the pull request solve a related issue?
  • If so, can you reference the issue like this Fixes #<issue_number>?
  • What does the pull request accomplish? Use a list if needed.
  • If it includes major visual changes please add screenshots.

  1. Please run npm run lint:prettier before submitting so that
    style issues are fixed.

  2. Don't forget to add an entry about your changes to
    the CHANGELOG.md file.

Note: Sometimes the development moves very fast. It is highly
recommended that you update your branch of develop before creating a
pull request to send us your changes. This makes everyone's lives
easier (including yours) and helps us out on the development team.

Thanks again and have a nice day!

fewieden and others added 30 commits September 18, 2021 03:50
@fewieden
fixed git helper async/await issues, template strings, clean up
75a5782
@fewieden
fixed updatenotification async/await issues and more es6
c2d2c27
@fewieden
nunjuck template for updatenotification
1dfa5d3
@fewieden
use nunjuck template, es6, removed unused config option
7be25c2
@fewieden
updated CHANGELOG.md
332e429
@MichMich
Prepare 2.18.0 Dev Branch
a49459b
@MichMich
Fix Formatting
1735ca5
@MichMich
Merge 2.17.1
e4a0a51
@fewieden
remove mocking from implementation and use jest to mock git cli instead
b094707
@fewieden
Merge branch 'develop' into clean-up-updatenotifications-and-nunjuck-…
fc06f13 
…templating

# Conflicts:
#	CHANGELOG.md
@fewieden
shorthand function
51967ed
@fewieden
bump ecmascript to 2018 for eslint
b0e3b64
@fewieden
remove obsolete snapshot
1751cab
@rejas
Use feels_like data from openweathermap instead of calculating it
d4168f6
@rejas
Update CHANGELOG
3d9c92f
@eouia
fix language Code kr->ko and add missed translation
6d4b4dd
@eouia
edit CHANGELOG
7a9f9b2
@eouia
Merge branch 'develop' into ko
cb753f5
@khassel
move calendar tests from category electron to e2e
1d12e57
@MichMich
Merge pull request #2683 from khassel/calendar-test
016a1e9
Update dependencies
04a9ca9
@MichMich
Merge pull request #2680 from rejas/issue_2678
7fdeed1
@MichMich
Merge branch 'develop' into clean-up-updatenotifications-and-nunjuck-…
5bfbd3e 
…templating
@MichMich
Merge pull request #2679 from fewieden/clean-up-updatenotifications-a…
5074123 
…nd-nunjuck-templating

Clean up updatenotifications and nunjuck templating
@eouia
fix translations.js
9661133
@eouia
Merge branch 'ko' of https://github.com/MMRIZE/MagicMirror into ko
d8940a9
@eouia
Merge branch 'develop' into ko
a720207
@eouia
fix ko language
a2fd354
@eouia
fix Language ko
bbe4ef8
@eouia
modify CHANGELOG.md
3ae9686
MichMich and others added 28 commits December 23, 2021 18:56
@MichMich
Merge pull request #2746 from khassel/node-version-update
bd5664c
@sdetweil
fix calendar across timezone, showEnd/FullDay
b3ef4b4
@sdetweil
Merge branch 'develop' into calfix
75c2977
@sdetweil
after prettier
f75ca0c
@sdetweil
past prettier
c5ed70d
@MichMich
Merge pull request #2748 from sdetweil/calfix
512c392
@KristjanESPERANTO
End-to-End Testing + Format
58c48b1
@KristjanESPERANTO
Update CONTRIBUTING.md
855860c
@khassel
added test for calendar recurring event with checks the correct date …
a954a62 
…displayed (related to #2752)
@kolbyjack
Perform customEvent symbols replacement in symbolsForEvent
c579989
@kolbyjack
Add CHANGELOG entry
cf428dc
@khassel
iterate over timezones
5d8f2f5
@sdetweil
fix date correction comparison for fulldate, just less than, not less…
fc14431 
… or equal
@sdetweil
add changelog entry
95b5873
@sdetweil
enable useHTTP for full electron version
28d866c
@sdetweil
Merge branch 'develop' into fixhttps
c605023
@sdetweil
fix changelog
446bb22
@sdetweil
Merge branch 'fixhttps' of https://github.com/sdetweil/MagicMirror in…
710d51b 
…to fixhttps
@MichMich
Merge pull request #2756 from sdetweil/fixhttps
da51a55
@sdetweil
Merge branch 'develop' into newcal
b35d25e
@MichMich
Merge pull request #2755 from sdetweil/newcal
4ad832d
@MichMich
Merge pull request #2751 from KristjanESPERANTO/patch-1
c4d2a7b 
Add End-to-End Testing + Format
@kolbyjack
Merge branch 'develop' into broadcast-custom-symbols
bf83341
@khassel
Merge branch 'develop' into calendar-test
32382dc
@MichMich
Merge pull request #2753 from khassel/calendar-test
01010fe
@MichMich
Merge pull request #2754 from kolbyjack/broadcast-custom-symbols
7a7ed48
@MichMich
Prepare 2.18.0.
4c919a7
@MichMich
Merge pull request #2760 from MichMich/prepare-release-2.18.0
be073da 
Prepare-release-2.18.0
@codecov-commenter
Copy link

Codecov Report

Merging #2761 (be073da) into master (222a5f3) will decrease coverage by 2.15%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2761      +/-   ##
==========================================
- Coverage   70.83%   68.67%   -2.16%     
==========================================
  Files          13        8       -5     
  Lines         696      265     -431     
==========================================
- Hits          493      182     -311     
+ Misses        203       83     -120
Impacted Files Coverage Δ
js/electron.js 71.66% <50.00%> (-2.02%) ⬇️
js/app.js 59.66% <0.00%> (-10.09%) ⬇️
js/server.js 85.18% <0.00%> (-1.86%) ⬇️
modules/default/calendar/calendarfetcher.js
modules/default/calendar/calendarutils.js
js/class.js
js/node_helper.js
modules/default/calendar/node_helper.js

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 222a5f3...be073da. Read the comment docs.

@MichMich MichMich merged commit a6cbc9f into master Jan 1, 2022
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.