summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | IE < 10 does not support gradients.Tom2014-11-171-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the new imgdiff UI heavily used gradients, this leaves IE9 and IE8 users with a complete disfunctional UI. Replaced all gradients by simpler means: * Vertical handle: instead of 2px wide gradient, use a 1px background and a white border-right * Opacity slider: No gradient but a simple border and background-color * All radial-gradients replaced by small pre-computed PNGs * Checkerboard background done with a small repeated PNG With these changes, the imgdiff UI is fully functional even in IE 8. Visual changes in other browsers are barely discernible.
* | Make the sliders clickable.Tom2014-11-151-17/+61
| | | | | | | | | | | | Always having to drag is cumbersome. Now the slider's handle can also be set by clicking on the slider. Heh :-) I see the GitHub UI designers hadn't thought of that.
* | Minor corrections in JavascriptTom2014-11-151-6/+7
| | | | | | | | | | | | | | | | | | 1. Stop running animation before starting a new one. 2. Fix ratio in animation 3. Fix div width None of these change have any visible effect in the current use of this script. (1) is just being safe, in (2) , the wrongly calculated value was never used,and in (3), the div was a little too wide before.
* | Javascript-based sliders styled with CSSTom2014-11-143-90/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works better for small images. The previous CSS-resize based attempt worked reasonably well, but had two problems on WebKit (Safari): 1. For very small images the red resize handle would overlap the image itself. In that case, the image became un-draggable as soon as the opacity was reduced below 1.0. 2. Safari apparently doesn't send mousemove events during a CSS resize, so the opacity was changed only on mouseup. Both observed on Safari 6.1.6 and 7.1. FF 33.1 had no problems. Therefore I've switched to a Javascript slider. Since I didn't find any that was simple, did not require HTML 5, appeared to be well maintained, had a bug tracker and not too many outstanding bug reports, didn't pull in umpteen other dependencies, didn't suffer from feature bloat, was compatible with jQuery 1.7.1, and was freely licensed, I ended up writing my own. imgdiff.js contains a small Javascript slider (only horizontal) that is styled completely in CSS. It reports ratios in the range [0..1] and fires nice jQuery events 'slider:pos' on value changes. Base element is a plain div that is positioned. It's not a general-purpose do-it-all slider, but it's small, simple, and works for what we need it. (imgdiff.js also sets up the ese sliders on the diff pages.)
* | Fix that opacity sliderTom2014-11-133-24/+48
| | | | | | | | | | | | | | Using the browser's built-in slider doesn't work if the browser hides scrollbars (like Firefox on Mac). So,construct our own slider with three divs and some CSS. Event-handling Javascript changed to match this new implementation.
* | Typo in comment, and optional semicolon in JSTom2014-11-132-2/+2
| |
* | 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
| |
* | 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.)
* | 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
| |
* | Miscellaneous fixes to the Fedora service installer scriptBerke Viktor2014-10-311-5/+2
| |
* | Allow finer-grained determination of available transport preferencesJames Moger2014-10-313-7/+42
| |
* | Only set mutable user access permissionsJames Moger2014-10-311-1/+3
| |
* | Fix exception in FileTicketService when deleting a repositoryJames Moger2014-10-311-0/+4
| |
* | Gracefully handle missing integration branch in ticket pageJames Moger2014-10-314-9/+25
| |
* | Merge release 1.6.2James Moger2014-10-281-3/+3
|\|
| * DocumentationJames Moger2014-10-271-3/+3
| |
| * Fix PluginManager not properly respecting --noverifyJames Moger2014-10-271-0/+4
| |
* | Merged #110 "Support multiple/chained config files"James Moger2014-10-279-1895/+2018
|\ \
| * | Adopt chain-loading properties as the default setupJames Moger2014-10-279-1904/+1972
| | |
| * | 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-261-3/+2
|\ \ \ | |/ / |/| / | |/
| * Fix raw servlet trashing paths with spacesJames Moger2014-10-261-3/+2
| |
* | Fix broken implementation of --noverify for installing a plugin from a urlJames Moger2014-10-231-1/+5
| |
* | Small adjustment to FilterableRepositoryList css classesJames Moger2014-10-231-5/+5
| |
* | Integrate GitHub OcticonsJames Moger2014-10-2318-88/+1075
| |
* | Merge branch 'ticket/210' into developJames Moger2014-10-221-338/+338
|\|
| * Use unicode in french translationptemplier2014-10-221-338/+338
| | | | | | translated using native2ascii
* | Fix critical severity dot positioningJames Moger2014-10-211-1/+1
| |
* | Remove S# text, set severity in tooltipJames Moger2014-10-213-21/+24
| |
* | Adjust priority & severity CSSJames Moger2014-10-211-16/+21
| | | | | | | | | | | | | | | | - Severity: more severe are ROY, less severe are GB - Replaced first-letter of severity with S# and show # dots - Priority: higher priorityare RO, lower priority is B I really like the 'C, 'CA' idea but that will definitely lead to translation questions. The S# approach will still generate the same complaints, but at least it is more generic.
* | Tickets - Priority, Severity optionsPaul Martin2014-10-2020-18/+536
| | | | | | | | | | | | | | | | | | + Severity indicated via new character indicator and color of ticket icon on ticket list + Priority indicated via new priority icon and color on ticket list + Indexed as integers to provide sorting and maintain language neutral index + Colours and indicator text controlled through CSS classes priority-<x> & severity-<x> + UITicketTest created to generate tickets of all types to ease debugging
* | Merge release-1.6.1James Moger2014-10-203-3/+11
|\|
| * Correct unit test assertionJames Moger2014-10-201-1/+1
| |
| * Prepare v1.6.1 documentation updatesJames Moger2014-10-202-2/+10
| |
| * Fix potential NPE when excluding last change authorJames Moger2014-10-131-1/+1
| |
| * Fix GitBlitTest.testGitblitSettings()James Moger2014-10-131-1/+5
| |
| * Fix backslash regression in relative path determiniationJames Moger2014-10-131-1/+1
| |