Skip to content

Conversation

@khassel
Copy link
Collaborator

@khassel khassel commented Jun 1, 2025

changes:

  • merged master
  • cleanup cspell.config.json
  • updates concerning vendor and windows install

rejas and others added 7 commits April 2, 2025 10:09
Co-authored-by: veeck <gitkraken@veeck.de>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.1.4/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.1.4/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.1.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.1.5/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.1.5/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* bump dependencies

* run linter

---------

Co-authored-by: veeck <gitkraken@veeck.de>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.6 to 6.2.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@khassel khassel requested a review from rejas June 1, 2025 19:58
@KristjanESPERANTO KristjanESPERANTO merged commit f635f50 into MagicMirrorOrg:develop Jun 4, 2025
KristjanESPERANTO pushed a commit that referenced this pull request Jun 4, 2025
@KristjanESPERANTO
Copy link
Contributor

@khassel and @rejas: I thought a rebase merge would be cleaner, and would now reset master to develop. But maybe I was too hasty here, sorry. Before I make things even worse, I wanted to stop and ask you first.

@khassel
Copy link
Collaborator Author

khassel commented Jun 4, 2025

well, AFAIS you did a rebase of the PR branch and moved develop to the top. So practically you did the merge of this PR already which is o.k. from my side. @rejas can review the moved develop and if he complains about something we fix it with a new PR.

@khassel
Copy link
Collaborator Author

khassel commented Jun 4, 2025

the main problem here began earlier: I wanted to create the PR but the develop branch was too old, there were new commits on master which were missing on develop. So I decided to start on develop with my new branch, then merged master and then did the work on top.

The better choice would have been to do the merge master into develop before creating the new feature branch.

To avoid this in the future we should always do the merge master into develop after a feature branch was merged into master. Maybe we can automate this with github actions.

Edit: https://medium.com/@karlstad/create-a-github-actions-workflow-that-auto-merges-the-master-back-to-dev-branch-8b1ebe7009b3

@KristjanESPERANTO
Copy link
Contributor

Thanks for the clarification, Karsten 🙂 Such a GitHub action sounds useful.

@rejas
Copy link
Collaborator

rejas commented Jun 5, 2025

Maybe we can automate this with github actions.

I agree, a good idea, so I created an issue for grabbing: #311

khassel added a commit that referenced this pull request Jun 30, 2025
* weather.md: update for recent changes (#230)

* add updates feature configuration (#234)

* Update calendar.md (#236)

* updateOnFetch feature Docs (#235)

* Minor changes (#238)

* Minor changes
- wording
- Magic Mirror -> MagicMirror
- format

* sh -> shell

* Update compliments docs page (#242)

Add documentation for the specialDayUnique config option

* Cleanup formatting (#247)

* bump prettier

* run prettier

* UK Met Office Documentation Fix (#253)

* Update weather.md

Updated documentation for MetOffice update

* Update weather.md

* add doc for new compliments(#3481) and support custom positions (#3518) (#254)

* add doc for new compliments(#3481) and support custom positions (#3518)

* fix typo

* update compliments, and module position info (#255)

* add doc for new compliments(#3481) and support custom positions (#3518)

* fix typo

* Added docs for new notification `MODULE_DOM_UPDATED` (#262)

* Bump send and express (#260)

Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together.

Updates `send` from 0.18.0 to 0.19.0
- [Release notes](https://github.com/pillarjs/send/releases)
- [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md)
- [Commits](pillarjs/send@0.18.0...0.19.0)

Updates `express` from 4.20.0 to 4.21.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](expressjs/express@4.20.0...4.21.0)

---
updated-dependencies:
- dependency-name: send
  dependency-type: indirect
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added docs for new notification - . Fixes #261

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update Windows section and add Wayland section (#265)

According to the changes in PR MagicMirrorOrg/MagicMirror#3594.

* add clarification for nextDaysRelative and showEndsOnlyWithDuration, … (#268)

* add clarification for nextDaysRelative and showEndsOnlyWithDuration, only apply to full day events

* add emphasis for PREVENT on showEndsOnlyWithDuration

* electron-rebuild -> @electron/rebuild (#271)

electron-rebuild has been deprecated.

* update doc for #3630 (#273)

* fix typos, add doc for calendar FullDateEnd format usage, add new env for fetch timeout (#277)

* fix typos, add doc for calendar FullDateEnd format usage, add new env variable for fetch timeout

* bump deps

* lint docs

* fix typo

---------

Co-authored-by: veeck <gitkraken@veeck.de>

* prepare release 2.31.0

* Upgrade to Vuepress2 (#214)

* Start migrating to v2

* Make CarbonAds work again

* Remove dead files and cleanups

* Bump vue

* Bump to rc2

* Bump to rc8

* Bump to rc9

* Add logo, remove contributor list

* Bump to rc11

* Fix menu

* Bump to rec12

* Bump to rc14

* bump dependencies

* bump dependencies

* bump to rc19

---------

Co-authored-by: veeck <gitkraken@veeck.de>

* fix and update dependencies

* update package-lock.json

* Final cleanups (#287)

* remove yarn lock

* add discord link

* bump deps

* add alt text

---------

Co-authored-by: veeck <gitkraken@veeck.de>

* newsfeed: add new properties for feeds (#294)

see MagicMirrorOrg/MagicMirror#3742

* [updatenotification] Added option to iterate over modules directory instead using modules defined in `config.js`, doc for MagicMirrorOrg/MagicMirror#3755 (#295)

* add info for clock css and deprecated property, clarify property use for calendar (pastDaysCount) (#292)

* Update weather.md (#281)

* Cleanups (#297)

* update deps

* run linter

* bump rc deps

---------

Co-authored-by: veeck <gitkraken@veeck.de>

* Add documentation for disableNextEvent (#307)

* Update clock.md

* Add documentation for disableNextEvent (#307)

* Update clock.md

* Update clock.md

* Update clock.md (#309)

* fix compliments option table (#300)

Co-authored-by: veeck <gitkraken@veeck.de>

* Bump vite from 6.1.3 to 6.1.4 (#302)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.1.4/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.1.4/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.1.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* replace `npm start` with `npm run start` (#304)

* Bump vite from 6.1.4 to 6.1.5 (#305)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.1.5/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.1.5/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependencies (#306)

* bump dependencies

* run linter

---------

Co-authored-by: veeck <gitkraken@veeck.de>

* Bump vite from 6.2.6 to 6.2.7 (#308)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.6 to 6.2.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* changes after removal of dirs fonts and vendor, remove unneeded ignorePaths from cspell.config.json (#310)

* docs: reword windows part and move it from "Installation" to "Usage" section (#310)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ross Younger <crazyscot@gmail.com>
Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr>
Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Co-authored-by: veeck <michael.veeck@nebenan.de>
Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com>
Co-authored-by: Veeck <github@veeck.de>
Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com>
Co-authored-by: sam detweiler <sdetweil@gmail.com>
Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: veeck <gitkraken@veeck.de>
Co-authored-by: Maxwell <37151645+princemaxwell@users.noreply.github.com>
Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com>
@khassel khassel deleted the fonts branch June 30, 2025 23:00
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.

3 participants