Merge 2.8 release with master #1887
Merged
Conversation
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
* This solution is an hotfix for overrite issue came back on 2.8.0 version. What I did is checking the extension, and if it is null, adding .jpg suffix. Because commons files always have suffixes, and we should compare file names after adding suffixes. Othervise overrides are possible. * Check if file title includes an extension already, by checking if is there any dot in it. * Fix logic error * Add uncovered tests * Remove unecessary line breaks * Make Javadocs more explicit
* Versioning for v2.8.2 * Changelog for v2.8.2
* Refactor feedback and quiz to reduce possibility of NPE * Handle throwables in quiz checker * Minor refactoring
* Update changelog.md * Versioning for v2.8.3
|
Have resolved conflicts. Can be merged once the checks pass. |
|
All checks have passed. Merging it now. :) |
|
Ummm @maskaravivek , any idea why 2.8-release now has commits from master, with the latest being this PR? :/ https://github.com/commons-app/apps-android-commons/commits/2.8-release From what I can see this PR only merges the 2.8-release commits into master (which is correct), but why does the reverse happen? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Title (required)
Merge 2.8 release with master