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

Fixed show/hide all text link on calendar page with no upcoming events #296

Merged
merged 3 commits into from
Oct 24, 2017

Conversation

graymur
Copy link
Collaborator

@graymur graymur commented Oct 18, 2017

Added .gitattributes

Now when past events are hidden title will say "No upcoming events from Today (...)":

bcb6370463

How to test

http://rcn-io-staging.herokuapp.com/calendars/usac-2017?past=visible

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

Added .gitattributes

why?

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

@graymur Thanks for the PR, I updated description to use inline image vs the link.

@graymur
Copy link
Collaborator Author

graymur commented Oct 18, 2017

@Restuta

why?

So we don't have problems with line endings between MacOS/Win

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

@graymur we shouldn't have any, your local git setup should have default setting text=auto it will convert line endings during checkout and before push.

https://help.github.com/articles/dealing-with-line-endings/

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

fixes #294

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

Test it out, great work, thanks a lot for the fix 👍 Idk what I was thinking when I added that check.

@Restuta
Copy link
Owner

Restuta commented Oct 18, 2017

We will have to fix the build though by fixing #298 since it can break production

@graymur
Copy link
Collaborator Author

graymur commented Oct 19, 2017

Idk what I was thinking when I added that check.

Happens to the best of us)

@Restuta Restuta merged commit bef3127 into master Oct 24, 2017
@Restuta Restuta deleted the dev.past-events-link-text branch October 24, 2017 02:59
@Restuta Restuta added the Closed label Oct 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants