Conversation
Add Audio Support
* Remove hidden file from directory thumbnails * Fix typo * Fix show button * Update README with local dev instructions * Fix directory thumbnails showing hidden files
* Add .swp files to gitignore * Display more helpful lockdown page, move more routes behind lockdown
* Allow alumni to view hidden files * Update nav.html
* Upgrade pip Fixes Docker build issue caused by an issue in pip 19 Issue occurred when using --no-cache-dir * Pip werkzeug version
sgreene570
approved these changes
Jul 27, 2020
sgreene570
reviewed
Jul 27, 2020
| .mypy_cache | ||
|
|
||
| # vim swap files | ||
| *.swp |
Member
|
@mxmeinhold looks like I mistakenly squash merged into master for 2.1.1 (hence that version bump + a few other commits still showing in this PR): thoughts on how to merge this without creating weird git hitsory? |
Contributor
Author
|
I'll see what I can do, and update the PR description to reflect the proper history. Also adding a version bump to 2.1.2. |
Update to include squash merge from #59 (2.1.1)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Features included in this PR
This PR also reflects commits introduced in Gallery 2.1.1 (#59), but they aren't reflected in this changelog, since they were already included by squash commit f693427.