summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-181-3/+168
|\ | | | | Ticket Reference handling #1048
| * Ticket Reference handling #1048Paul Martin2016-04-271-3/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Supports referencing: + Tickets from other tickets via comments + Tickets from commits on any branch + Common TicketLink class used for both commits and tickets + TicketLink is temporary and persisted to ticket as a Reference + Support deletion of ticket references + Rebasing patchsets/branches will generate new references + Deleting old patchsets/branches will remove the relevant references + Substantial testing of use cases + With and without patchsets, deleting, amending + BranchTicketService used during testing to allow end-to-end ref testing + Relocated common git helper functions to JGitUtils
* | fix baseURL handling in HttpUtils, fixes #1083Dirk Steinkopf2016-06-121-2/+14
|/
* Fix for #962 - Delete patchset abilityPaul Martin2016-04-061-7/+3
|
* Friendly URL for EditFile Page #974Paul Martin2016-03-271-0/+17
| | | | + Prevent Edit of old doc version
* Document edit capability via ProseMirror submodule #974Paul Martin2016-03-271-0/+131
| | | | | | | | | | | | + New docEdit page with links from docPage and docList + Bespoke menu system with full screen edit mode + npm required for building client side scripts + Ant script added for BuildUI which performs npm commands + Update font-awesome to 4.5.0 + Factor out to JGitUtils common code in BranchTicketService for EditFilePage + getTreeEntries + commitIndex + Merge capability for document editing
* Fix for #976 - Filestore links via browserPaul Martin2015-12-255-47/+196
| | | | | | | | | | | | | + GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
* Fix 2 possible NullPointer occurencesmarco2015-11-231-1/+10
|
* Git-LFS supportPaul Martin2015-10-101-7/+14
| | | | | | | | | | | | | | + Metadata maintained in append-only JSON file providing complete audit history. + Filestore menu item + Lists filestore items + Current size and availability + Link to GitBlit Filestore help page (top right) + Hooks into existing repository permissions + Uses default repository path for out-of-box operation with Git-LFS client + accessRestrictionFilter now has access to http method and auth header + Testing for servlet and manager
* Use author date to be consistent with other tools (fixes #919)James Moger2015-09-182-3/+6
|
* Update to Pegdown 1.5.0James Moger2015-09-181-1/+2
|
* Merged #258 "Create an avatar provider that defaults to Gravatar"James Moger2015-06-151-2/+2
|\
| * Revised AvatarGenerator to be injectableJames Moger2015-06-151-2/+2
| |
* | Bump to JGit 4.0.0Luca Milanesio2015-06-123-18/+18
|/ | | | | JGit 4.0.0 fixes a memory leak but introduces a non-compatible change for closing the RevWalk: before it was release() but now is close()
* Implement configurable tab length support for blob viewsJames Moger2015-05-223-21/+48
|
* Cleanup diff rename outputJames Moger2015-05-221-1/+2
|
* Parse X509 DN with LdapNameJames Moger2015-05-221-10/+12
|
* Add links to commit diff and blob diff pages to toggle whitespace settingJames Moger2015-03-071-6/+14
|
* Add DiffComparator argument to all DiffUtils calls, default to ignore all ↵James Moger2015-03-071-18/+52
| | | | whitespace
* Restore tab conversion to 4 spaces in HTML diff outputJames Moger2015-03-071-3/+5
|
* Merge branch 'ticket/244' into developJames Moger2015-03-071-0/+33
|\
| * Minor refactoring of user/team checksummingJames Moger2015-03-071-0/+33
| |
| * Whitelist the "target" link attribute in the XSS filterJames Moger2014-11-041-1/+1
| |
| * Fix backslash regression in relative path determiniationJames Moger2014-10-131-1/+1
| |
* | Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, ↵James Moger2015-03-052-2/+18
| | | | | | | | args4j, Jedis, waffle-jna, Unboundid
* | #230 - Improve empty folder navigation.Milos Cubrilo2015-01-112-202/+392
| | | | | | | | Empty folders are automatically skipped when browsing repository tree (similar to github "folder jumping" feature).
* | Opacity adjustments for image diffsTom2014-11-121-1/+1
| | | | | | | | | | | | | | | | * 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.
* | Image diffsTom2014-11-113-20/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | 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-061-46/+30
| | | | | | | | | | | | - 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-063-239/+519
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.)
* | Whitelist the "target" link attribute in the XSS filterJames Moger2014-11-041-1/+1
| |
* | Gracefully handle missing integration branch in ticket pageJames Moger2014-10-311-4/+14
| |
* | Fix backslash regression in relative path determiniationJames Moger2014-10-131-1/+1
| |
* | Merge branch 'ticket/204' into developJames Moger2014-10-101-14/+6
|\|
| * Improve relative path determination using Java 7 PathsJames Moger2014-10-101-14/+6
| |
* | Merge branch 'ticket/129' into developJames Moger2014-09-301-1/+1
|\|
| * Remove Wicket references from non-Wicket packagesJames Moger2014-09-301-1/+1
| |
* | Merge branch 'ticket/181' into developJames Moger2014-09-171-4/+6
|\|
| * Sanitize ticket text at presentation time to avoid unintended html encodingJames Moger2014-09-171-4/+6
| |
* | Merge branch 'ticket/169' into developJames Moger2014-09-081-1/+5
|\|
| * Improve bad request handling in branch graph, zip, & syndication servletsJames Moger2014-09-081-1/+5
| |
* | Merge branch 'ticket/161' into developJames Moger2014-09-081-11/+12
|\|
| * Expose setting to control Lucene repository indexing frequencyJames Moger2014-09-081-11/+12
| |
* | Merge branch 'ticket/164' into developJames Moger2014-09-072-0/+156
|\|
| * Create infrastructure for XSS sanitizationJames Moger2014-09-072-0/+151
|/
* Merge branch 'ticket/100' into release-v1.6.0James Moger2014-06-121-1/+3
|\
| * Fix cloning repositories with + in their namesJames Moger2014-06-121-1/+3
| |