summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Opacity adjustments for image diffsTom2014-11-127-4/+80
| | | | | | | | * ImageDiffHandler adds the slider; styled in gitblit.css * imgdiff.js is a little bottom-loaded Javascript that adjusts the opacity on sliders' scroll events. * The three diff pages add this bottom script to the page if needed * GitBlitDiffFormatter: center image diffs.
* HTML bug fix on the blob pageTom2014-11-122-3/+4
| | | | | | | That blob page sent *two* body tags. Now that we have bottom scripts, we can fix that easily: don't try to set body.onload, but run the prettyprinting through a bottom script on jQuery's document.ready.
* Support for adding bottom scriptsTom2014-11-122-0/+40
| | | | | | | | | | | Needed if we want to have opacity changes in image diffs because jQuery is bottom-loaded, so we must ensure that any scripts using jQuery are run later. I'm not a Wicket expert; maybe there's a cleverer or cleaner way to do this. There is a JavascriptUtils class in Wicket, but that writes to the response -- I don't quite see how that would give me control over the precise placement of the scripts to ensure they come after that bottom-loaded jQuery.
* Image diffsTom2014-11-118-25/+477
| | | | | | | | | | | | | | | | | | | | | | | | Ticket 88: https://dev.gitblit.com/tickets/gitblit.git/88 Based on Lea Verou's pure CSS slider: http://lea.verou.me/2014/07/image-comparison-slider-with-pure-css/ * Add a callback interface, pass it through DiffUtils to the GitBlitDiffFormatter. Is needed because the rendering needs access to the repositoryName and other things that are known only at higher levels. * New class ImageDiffHandler responsible for rendering an image diff. Called for all binary diffs, doesn't do anything if it's not an image. HTML is generated via JSoup: no worries about forgetting to close a tag, not about HTML escaping, nor about XSS. * The 3 diff pages set up such an ImageDIffHandler and pass it along. * CSS changes: from Lea Verou, with some minor improvements. I think in the long run there'll be no way around rewriting the HTML diff formatter from scratch, not using the standard JGit DiffFormatter at all.
* Merge branch 'ticket/221' into developJames Moger2014-11-101-1/+1
|\
| * Update GitBlitWebApp_nl.propertieslarsmaes2014-11-061-1/+1
| | | | | | typo in Dutch translation
| * Exclude SSLv3 from Gitblit GO https protocolsJames Moger2014-11-041-0/+1
| |
| * Whitelist the "target" link attribute in the XSS filterJames Moger2014-11-041-1/+1
| |
| * Reset build identifiers for next point release cycleJames Moger2014-10-282-2/+20
| |
| * Merge release 1.6.2James Moger2014-10-285-13/+23
| |\
* | \ Merged #220 "Improve the diff page"James Moger2014-11-1010-288/+635
|\ \ \
| * | | Add min-width in .diff-line CSSTom2014-11-061-0/+1
| | | | | | | | | | | | To ensure the line number columns never get squashed.
| * | | Fix a copy/paste error in a comment.Tom2014-11-061-3/+3
| | | |
| * | | CSS changes.Tom2014-11-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As discussed: - gutter a little lighter, context lines nearly but not quite white. - 2px left (and right) padding in the code column. - I also noticed that somehow all lines were spaced vertically a little wider than on dev.gitblit. Added cellpadding='0' to get the old line height again.
| * | | More diff page improvementsTom2014-11-066-53/+37
| | | | | | | | | | | | | | | | | | | | | | | | - Use git object ids as fragments and HTML element ids - Simplify generation: don't parse the diff line, instead generate the table header from the DiffEntry when we process it, and just skip the diff lines.
| * | | Further diff improvementsTom2014-11-063-12/+74
| | | | | | | | | | | | | | | | - Add the new settings to gitblit.properties - Highlight trailing whitespace
| * | | Improve the commitdiff.Tom2014-11-067-283/+583
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Optimize CSS: simplify selectors. That alone cuts rendering time in half! * Adapt HTML generation accordingly. * Change line number generation so that one can select only code lines. Also move the +/- out of the code column; it also gets in the way when selecting. * Omit long diffs altogether. * Omit diff lines for deleted files, they're not particularly interesting. * Introduce a global limit on the maximum number of diff lines to show. * Supply translations for the languages I speak for the new messages. https://code.google.com/p/gitblit/issues/detail?id=450 was about a diff with nearly 300k changed lines (with more then 3000 files deleted). But one doesn't have to have such a monster commit to run into problems. My FF 32 become unresponsive for the 30+ seconds it takes it to render a commitdiff with some 30000 changed lines. (90% of which are in two generated files; the whole commit has just 20 files.) GitHub has no problems showing a commitdiff for this commit, but omits the two large generated files, which makes sense. This change implements a similar thing. Files with too many diff lines get omitted from the output, only the header and a message that the diff is too large remains. Additionally, there's a global limit on the length of a commitdiff; if we exceed that, the whole diff is truncated and the files not shown are listed. The CSS change improves performance by not using descendant selectors for all these table cells. Instead, we assign them precise classes and just use that in the CSS. The line number generation thing using data attributes and a :before selector in the CSS, which enables text selections only in the code column, is not strictly XHTML 1.0. (Data attributes are a feature of HTML 5.) However, reasonably modern browsers also handle this correctly if the page claims to be XHTML 1.0. Besides, the commitdiff page isn't XHTML compliant anyway; I don't think a pre-element may contain divs or even tables. (Note that this technique could be used on other diff pages, too. For instance on the blame page.)
* | | Merged #219 "Update to Guice 4.0-beta5"James Moger2014-11-044-6/+6
|\ \ \
| * | | Update to Guice 4.0-beta5James Moger2014-11-044-6/+6
|/ / /
* | | Merged #218 "Update to SSHD 0.13.0"James Moger2014-11-044-5/+6
|\ \ \
| * | | Update to SSHD 0.13.0James Moger2014-11-044-5/+6
|/ / /
* | | Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"James Moger2014-11-041-0/+1
|\ \ \
| * | | Exclude SSLv3 from Gitblit GO https protocolsJames Moger2014-11-041-0/+1
|/ / /
* | | Merged #216 "Whitelist the "target" link attribute in the XSS filter"James Moger2014-11-042-1/+3
|\ \ \
| * | | Whitelist the "target" link attribute in the XSS filterJames Moger2014-11-042-1/+3
|/ / /
* | | Merge pull request #227 from bviktor/developJames Moger2014-10-311-5/+2
|\ \ \ | | | | | | | | Miscellaneous fixes to the Fedora service installer script
| * | | Miscellaneous fixes to the Fedora service installer scriptBerke Viktor2014-10-311-5/+2
|/ / /
* | | Merged #215 "Allow finer-grained determination of available transport ↵James Moger2014-10-313-7/+42
|\ \ \ | | | | | | | | | | | | preferences"
| * | | Allow finer-grained determination of available transport preferencesJames Moger2014-10-313-7/+42
|/ / /
* | | Merged #214 "Only set mutable user access permissions"James Moger2014-10-312-1/+4
|\ \ \
| * | | Only set mutable user access permissionsJames Moger2014-10-312-1/+4
|/ / /
* | | Merged #213 "Fix exception in FileTicketService when deleting a repository"James Moger2014-10-312-0/+5
|\ \ \
| * | | Fix exception in FileTicketService when deleting a repositoryJames Moger2014-10-312-0/+5
|/ / /
* | | Merged #212 "Gracefully handle missing integration branch in ticket page"James Moger2014-10-315-10/+28
|\ \ \
| * | | Gracefully handle missing integration branch in ticket pageJames Moger2014-10-315-10/+28
|/ / /
* | | Merge release 1.6.2James Moger2014-10-284-6/+12
|\ \ \ | | |/ | |/|
| * | Prepare 1.6.2 releasev1.6.2James Moger2014-10-282-10/+10
| | |
| * | DocumentationJames Moger2014-10-272-3/+7
| | |
| * | Fix PluginManager not properly respecting --noverifyJames Moger2014-10-272-0/+6
| |/
| * Merged #211 "Fix raw servlet trashing paths with spaces"James Moger2014-10-262-3/+4
| |\
* | \ Merged #110 "Support multiple/chained config files"James Moger2014-10-2711-1904/+2034
|\ \ \
| * | | Adopt chain-loading properties as the default setupJames Moger2014-10-2711-1913/+1988
| | | |
| * | | Supported include keys in gitblit.propertiesJames Moger2014-10-261-0/+55
| | | | | | | | | | | | | | | | | | | | This allows you to build a hierarchy of properties files or for a properties file to include default settings.
* | | | Merge branch 'ticket/211' into developJames Moger2014-10-262-7/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix raw servlet trashing paths with spacesJames Moger2014-10-262-3/+4
| |/
| * DocumentationJames Moger2014-10-221-2/+4
| |
| * Merged #210 "Use unicode in french translation"James Moger2014-10-221-338/+338
| |\
* | \ Merged #209 "Plugin manager does not completely respect --noverify"James Moger2014-10-231-1/+5
|\ \ \
| * | | Fix broken implementation of --noverify for installing a plugin from a urlJames Moger2014-10-231-1/+5
|/ / /
* | | DocumentationJames Moger2014-10-231-1/+2
| | |