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.

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

Bug fix to correctly handle the logic for 'maxEntries' Issue #2050 #2051

Closed
wants to merge 5 commits into from
Closed

Conversation

chamakura
Copy link
Contributor

  • Does the pull request solve a related issue? Yes
  • If so, can you reference the issue? Recurring events don't show up w/ the default Calendar #2050
  • What does the pull request accomplish? Use a list if needed.
    ** Removes the logic of filtering events by maxEntries from calendarfetcher.js
    ** Results in the logic of filtering to solely be done in calendar.js
  • If it includes major visual changes please add screenshots.

CHANGELOG.md Outdated
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²

## [20.11.1] - 2020-06-20
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you will have let @MichMich to decide if a bugfix release will happen for that...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I only added this because the guidelines suggested me to edit the changelog. I'm happy to revert this change if needed.

@MichMich
Copy link
Collaborator

Please add the changelog to the 2.12 entry. Thanks.

@chamakura
Copy link
Contributor Author

@MichMich: I updated the version to 2.12.0 - is that what you're suggesting?

@rejas
Copy link
Collaborator

rejas commented Jun 20, 2020

Have you started your work from the master or the develop branch? Seems like the former which leads to these merge conflicts.

@chamakura
Copy link
Contributor Author

Ah, sorry about that - I had started from master. Should I just abort this pull request and submit a new one?
Again, sorry for the back and forth here.

@chamakura chamakura closed this Jun 20, 2020
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