Skip to content

Conversation

@rejas
Copy link
Collaborator

@rejas rejas commented Oct 7, 2022

Moves files around and renames some so that the structure is cleaner and more consistent

rejas added 2 commits October 7, 2022 13:52
move helpers and mocks into their own directories
rename some for consistency
@rejas rejas changed the base branch from master to develop October 7, 2022 13:14
@codecov-commenter
Copy link

codecov-commenter commented Oct 7, 2022

Codecov Report

Merging #2937 (312affc) into develop (d5e855d) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff            @@
##           develop    #2937   +/-   ##
========================================
  Coverage    63.82%   63.82%           
========================================
  Files            9        9           
  Lines          293      293           
========================================
  Hits           187      187           
  Misses         106      106           
Impacted Files Coverage Δ
js/server.js 66.21% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@rejas rejas force-pushed the test_dir_structure branch from caa0f76 to 3059ae2 Compare October 7, 2022 14:12
@rejas rejas force-pushed the test_dir_structure branch from 3059ae2 to 312affc Compare October 7, 2022 14:23
@rejas rejas marked this pull request as ready for review October 7, 2022 14:54
@rejas rejas requested a review from khassel October 7, 2022 14:54
@khassel
Copy link
Collaborator

khassel commented Oct 7, 2022

so new rule:

  • never merge your own PRs
  • never merge without someone else having approved?

so I'm not allowed to merge this, so may @sdetweil can press the button?

@sdetweil sdetweil merged commit a328ce5 into MagicMirrorOrg:develop Oct 7, 2022
@rejas rejas deleted the test_dir_structure branch October 7, 2022 17:47
@rejas
Copy link
Collaborator Author

rejas commented Oct 7, 2022

so I'm not allowed to merge this, so may @sdetweil can press the button?

well, we can do it in this "threeway" round, but I'd be okay with "the one who approves it can also merge it".

@khassel
Copy link
Collaborator

khassel commented Oct 7, 2022

well, we can do it in this "threeway" round, but I'd be okay with "the one who approves it can also merge it".

o.k. for me, so new rules:

  • never merge your own PRs
  • never merge without at least one approval

@sdetweil
Copy link
Collaborator

sdetweil commented Oct 7, 2022

sounds good

@rejas
Copy link
Collaborator Author

rejas commented Oct 7, 2022

mh... is there any place in the project to write this down for future generations? :-)

@khassel
Copy link
Collaborator

khassel commented Oct 7, 2022

and a place to discuss such things at a central point?

@khassel
Copy link
Collaborator

khassel commented Oct 7, 2022

mh... is there any place in the project to write this down for future generations? :-)

we could create a Collaborator.md in the main dir of the repo.

and a place to discuss such things at a central point?

we could create an issue collaborator talk and close this directly so it is a little hidden.

Better ideas welcome ...

@rejas
Copy link
Collaborator Author

rejas commented Oct 11, 2022

+1 for the Collaborator.md

Discussion: Maybe it spossible to have a closed / hidden topic in the MM forum?

@sdetweil
Copy link
Collaborator

we could certainly have a collaborator only channel on discord..

@sdetweil
Copy link
Collaborator

sdetweil commented Oct 11, 2022

I opened a collaboration channel under MagicMirror

give me your IDs and I will add you

@sdetweil
Copy link
Collaborator

sdetweil commented Oct 11, 2022

done

under other channels

added collaborator role too

@rejas
Copy link
Collaborator Author

rejas commented Oct 12, 2022

thx, deleted my id post for privacy reasons :-)

@MagicMirrorOrg MagicMirrorOrg deleted a comment from khassel Oct 12, 2022
@sdetweil
Copy link
Collaborator

deleted Karsten's too

@sdetweil
Copy link
Collaborator

and from the github streamed activity on discord

@MichMich MichMich mentioned this pull request Jan 1, 2023
MichMich added a commit that referenced this pull request Jan 1, 2023
## [2.22.0] - 2023-01-01

Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge,
@KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails
and @tom.

Special thanks to @khassel, @rejas and @sdetweil for taking over most
(if not all) of the work on this release as project collaborators. This
version would not be there without their effort. Thank you!

### Added

- Added test for remoteFile option in compliments module
- Added hourlyWeather functionality to Weather.gov weather provider
- Removed weatherEndpoint definition from weathergov.js (not used)
- Added css class names "today" and "tomorrow" for default calendar
- Added Collaboration.md
- Added new github action for dependency review (#2862)
- Added a WeatherProvider for Open-Meteo
- Added Yr as a weather provider
- Added config options "ignoreXOriginHeader" and
"ignoreContentSecurityPolicy"

### Removed

- Removed usage of internal fetch function of node until it is more
stable

### Updated

- Cleaned up test directory (#2937) and jest config (#2959)
- Wait for all modules to start before declaring the system ready
(#2487)
- Updated e2e tests (moved `done()` in helper functions) and use es6
syntax in all tests
- Updated da translation
- Rework weather module
- Make sure smhi provider api only gets a maximum of 6 digits
coordinates (#2955)
  - Use fetch instead of XMLHttpRequest in weatherprovider (#2935)
  - Reworked how weatherproviders handle units (#2849)
  - Use unix() method for parsing times, fix suntimes on the way (#2950)
  - Refactor conversion functions into utils class (#2958)
- The `cors`-method in `server.js` now supports sending and recieving
HTTP headers
- Replace `&hellip;` by `…`
- Cleanup compliments module
- Updated dependencies including electron to v22 (#2903)

### Fixed

- Correctly show apparent temperature in SMHI weather provider
- Ensure updatenotification module isn't shown when local is _ahead_ of
remote
- Handle node_helper errors during startup (#2944)
- Possibility to change FontAwesome class in calendar, so icons like
`fab fa-facebook-square` works.
- Fix cors problems with newsfeed articles (as far as possible), allow
disabling cors per feed with option `useCorsProxy: false` (#2840)
- Tests not waiting for the application to start and stop before
starting the next test
- Fix electron tests failing sometimes in github workflow
- Fixed gap in clock module when displayed on the left side with
displayType=digital
- Fixed playwright issue by upgrading to v1.29.1 (#2969)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
Co-authored-by: Karsten Hassel <hassel@gmx.de>
Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com>
Co-authored-by: Veeck <github@veeck.de>
Co-authored-by: veeck <michael@veeck.de>
Co-authored-by: dWoolridge <dwoolridge@charter.net>
Co-authored-by: Johan <jojjepersson@yahoo.se>
Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com>
Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com>
Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com>
Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Co-authored-by: buxxi <buxxi@omfilm.net>
Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com>
Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants