summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket
Commit message (Collapse)AuthorAgeFilesLines
...
| * sort projects displayed on projects pageJoel Johnson2015-07-021-0/+2
| |
* | Merge pull request #284 from mrjoel/mrjoel-useshortrefsJames Moger2015-07-042-18/+14
|\ \ | | | | | | prefer shortened refs for cleaner/shorter URLs
| * | prefer shortened refs for cleaner/shorter URLsJoel Johnson2015-07-012-18/+14
| |/
* | Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurlJames Moger2015-07-042-19/+19
|\ \ | | | | | | allow internal privilege evaluation external URLs
| * | allow advertising gitblit privileges for external URLsJoel Johnson2015-07-012-19/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support for hiding internal URLs, but didn't consider that it broke the evaluation of permissions (used for tickets, etc.), and caused a NPE on repoUrl.permission when trying to view the TicketPage. With all internal mechanisms disabled, it would result in the first URL being external with unknown permissions. This adds an option to use internal permissions even for external URLs. Note that this does not grant any additional permissions, but does offer the option to have gitblit advertise the full set of what is allowed, even if the external URL imposes additional restrictions.
* / provide spacing on the projects page listingJoel Johnson2015-07-021-1/+1
|/ | | | | | | | | | The projects page was showing the project listing directly under the navbar with no spacing. This adds spacing to have the elements offset. The table is showing using the common "repositories" class, however it can't be changed directly since several other table displays use the same class, and have adequate top margin spacing. We create a new class for the one-off use on the projects page.
* Merged #258 "Create an avatar provider that defaults to Gravatar"James Moger2015-06-1515-37/+32
|\
| * Revised AvatarGenerator to be injectableJames Moger2015-06-153-36/+6
| |
| * First draft for a customized avatar imageFabrice Bacchella2015-06-1517-40/+65
| |
* | Bump to JGit 4.0.0Luca Milanesio2015-06-122-3/+3
|/ | | | | 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()
* Merged #57 "My Tickets needs a repository filter"James Moger2015-05-272-352/+446
|\
| * Applied changes according to code review comments.Eddy Young2015-05-231-15/+10
| | | | | | | | Removed default "watchedby" filter so that the default now includes "createdby", "responsible", watchedby" and "mention"
| * Changed the repository filter options to those related to the tickets owned ↵Eddy Young2015-05-221-378/+418
| | | | | | | | | | | | by the user. Also, minor refactoring to avoid code duplication.
| * Replaced repository name as search criterion with repository idEddy Young2015-05-221-30/+29
| |
| * Implemented ticket-57Eddy Young2015-05-192-10/+70
| |\
| | * Implemented filtering by repository for the My Tickets pageEddy Young2015-05-191-9/+12
| | |
| | * More changesEddy Young2015-05-192-5/+7
| | |
| | * Initial changes for ticket-57Eddy Young2015-05-182-10/+64
| | | | | | | | | | | | Added tags to .gitignore
* | | Create web.rewriteSession key for use with tomcat and CASFabrice Bacchella2015-05-231-1/+6
| | |
* | | Implement configurable tab length support for blob viewsJames Moger2015-05-226-9/+12
|/ /
* | Add a checkbox to control whitespace diff preference on the compare pageJames Moger2015-03-072-0/+22
| |
* | Add links to commit diff and blob diff pages to toggle whitespace settingJames Moger2015-03-076-7/+38
| |
* | Expose the DiffComparator choice as an url parameter (?w=1)James Moger2015-03-074-5/+11
| |
* | Add DiffComparator argument to all DiffUtils calls, default to ignore all ↵James Moger2015-03-073-4/+11
| | | | | | | | whitespace
* | Move the Delete Repository button to a separate "administration" tabJames Moger2015-03-072-3/+14
| |
* | Fix failure to save Allow Forks repository settingJames Moger2015-03-051-7/+3
| |
* | Merge branch 'ticket/242' into developJames Moger2015-02-261-4/+17
|\|
| * issue-545: Enforce repository permissions in patch pageJames Moger2015-02-261-4/+17
| |
| * Fix spelling mistakeSouthparkfan2015-02-261-1/+1
| |
* | Merged #240 "Fix spelling mistake"James Moger2015-02-261-1/+1
|\ \
| * | Fix spelling mistakeSouthparkfan2015-02-151-1/+1
| | |
* | | Merge branch 'ticket/238' into developJames Moger2015-02-262-9/+30
|\ \ \ | | |/ | |/|
| * | issue 564: enable ticket page update on tomcat with redirectskrulls2015-02-262-9/+30
| |/ | | | | | | | | | | issue 564: fix imports issue 564
* | #230 - Improve empty folder navigation.Milos Cubrilo2015-01-111-1/+1
| | | | | | | | Empty folders are automatically skipped when browsing repository tree (similar to github "folder jumping" feature).
* | Merged #227 "Small adjustments to allow integration with Gerrit Code Review"James Moger2014-12-032-2/+2
|\ \
| * | 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.
* | | 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
* | 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 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-125-2/+49
| | | | | | | | | | | | | | | | * 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-114-5/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.