summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
Commit message (Collapse)AuthorAgeFilesLines
* Add circular dependency check for tickets,ticket/235Zsombor Gegesy2014-12-093-18/+67
| | | | and refactor to get repositoryModel always from the page
* Add dependency to the lucene index, and display reverse dependant tickets ↵Zsombor Gegesy2014-12-095-1/+23
| | | | for pages
* Add 'dependency' to the ticket model and to the ui, with editing possibility ↵Zsombor Gegesy2014-12-0810-2/+186
| | | | with a separate relation editor panel
* Merged #228 "Add support for configurable HTTP proxy host/port in ↵James Moger2014-12-031-2/+11
|\ | | | | | | PluginManager.java"
| * Add support for specifying the `Proxy-Authorization` header for the ↵James Moger2014-12-031-2/+3
| | | | | | | | PluginManager
| * Add support for configurable HTTP proxy host/port in PluginManager.javaDariusz Bywalec2014-12-021-1/+9
| | | | | | | | | | Formerly by default the PluginMaganer would support no proxy setting. For servers behind firewall and HTTP proxy this would prevent installation of gitblit plugins.
* | Merged #227 "Small adjustments to allow integration with Gerrit Code Review"James Moger2014-12-033-5/+9
|\ \
| * | Use startManager(X) from startManager(Injector, Class)James Moger2014-12-031-3/+1
| | |
| * | Allow different aspect rations for top-left logoLuca Milanesio2014-11-292-2/+2
| | | | | | | | | | | | | | | | | | | | | When configuring a different top-left logo, we would like to allow to have a different HxW aspect ratio image. We need then to avoid locking down the height of the logo and just keep the existing aspect ration as-is.
| * | Allows starting an already instantiated managerLuca Milanesio2014-11-291-0/+6
| |/ | | | | | | | | | | When a manager is injected through other means, (e.g. using a different GuiceModule and injector in Gerrit) we need a way to start it without having to necessarily passing through the injection process again.
* / Added a new property: web.displayUserPanelJan Šmucr2014-11-271-1/+2
|/ | | | | This property allows the administrator to hide the user related part of the top panel. This can come handy if there's no use for it (i.e. if Gitblit runs as Gerrit plugin).
* Fix regression in BasePage due to changes in page construction for bottom ↵James Moger2014-11-251-20/+19
| | | | script injection
* Ensure that pretty-printed files are served as text/plain in Raw servletJames Moger2014-11-241-3/+12
|
* Fix time units in ldap sync log messageJames Moger2014-11-241-1/+2
|
* Extract WAR data resources if they do not exist in ${baseFolder}James Moger2014-11-241-4/+2
|
* Revise severity & priority permissionsJames Moger2014-11-204-24/+35
| | | | Ticket reporters should be able to specify severity whereas only those with repository push access should be able to specify priority. This also fixes a bug related to non-admin users creating tickets.
* Usability bug fixTom2014-11-191-2/+20
| | | | | | | | | If the opacity slider was moved to the far right faster than the animation showing the image, the user would never see the old file because opacity got adjusted right away. Now we first move the overlay slider to the right, so that something is visible, and then quickly animate opacity to the current value.
* Add support for image/svg+xml content type to raw servletJames Moger2014-11-191-3/+10
|
* Add a blink comparator and pixel difference to image diffsTom2014-11-198-15/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | Pixel difference uses CSS mix-blend-mode, which is supported currently only on Firefox >= 32 and on Safari >= 7.1. Implementation is behind a Javascript feature test. For other browsers, there's a blink comparator. Code changes: * ImageDiffHandler now takes the page it's used on as argument. We need that to get labels. DOM generated is a little bit different (new controls). * Diff pages adapted to new constructor of ImageDiffHandler. * CSS and Javascript changes implementing the new controls, making use of two new static image resources. Since I felt that the new controls deserved tooltips, I also gave the opacity slider a tooltip: changed to <a>, and slider handle changed from <div> to <span>. CSS ensures everything still displays the same (basically display:inline-block). * Supplied messages for English, French, and German for the new tooltips. Tested on IE8, Safari 6.1.6 & 7.1, Chrome 38, FF 33.1 & FF 3.6.13
* 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-142-20/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-6/+14
| | | | | | | 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-126-3/+50
| | | | | | | | * 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-117-25/+417
| | | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * Fix PluginManager not properly respecting --noverifyJames Moger2014-10-271-0/+4
| |
* | Fix a copy/paste error in a comment.Tom2014-11-061-3/+3
| |
* | CSS changes.Tom2014-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | - 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-061-12/+40
| | | | | | | | - Add the new settings to gitblit.properties - Highlight trailing whitespace
* | Improve the commitdiff.Tom2014-11-066-240/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| |
* | 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
| |
* | Merged #110 "Support multiple/chained config files"James Moger2014-10-272-7/+69
|\ \
| * | Adopt chain-loading properties as the default setupJames Moger2014-10-272-16/+23
| | |
| * | 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
| |