Open
Conversation
…l-master-master # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
Test documentation
…le to override properties from differ.properties
the anonymous view/layout is now located in its own class: AnonymousUserView
image thumbnails now scale horizontally, vertically, or both within their respective containers
removed transparent overlay from progress indicator
RemoteFile has been removed and replaced with the more robust UploadFile, which accepts local filesystem uploads as well. UploadFile filters by a configurable size and by an array of file extensions
*Note the following changes: -TOS now merged into About tab -Documentation and FAQ merged into Help tab -Added anchors in About and Help tabs for quick navigation -Help tab retrieves Documentation remotely. ***A temporary web address of http://www.google-melange.com is currently being used for testing*** -Improved some formatting issues (obsolete html files have not yet been deleted, simply renamed with the .old file extension)
results now save properly to xml during the comparison process; sample output provided in ./differ/results
previous commit forgot to make this optional via a button, now Save Results is executed manually by user
Conflicts: differ-webapp/src/main/java/cz/nkp/differ/gui/tabs/DifferProgramTab.java
fixed bug where out of bounds exception was being thrown when images of two different file types are compared. this should also correct the issue where conflicting properties were not being colored properly
results path now set to /tmp/differ/[username]/results
documentation link changed to https://differ.readthedocs.org/en/latest
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
4 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.
No description provided.