]> source.dussan.org Git - gitblit.git/log
gitblit.git
9 years agoCleanup diff rename output 52/252/1
James Moger [Fri, 22 May 2015 16:42:59 +0000 (12:42 -0400)]
Cleanup diff rename output

9 years agoMerged #251 "Add onFork and onRename methods to RepositoryLifeCycleListener"
James Moger [Fri, 22 May 2015 16:14:12 +0000 (10:14 -0600)]
Merged #251 "Add onFork and onRename methods to RepositoryLifeCycleListener"

9 years agoAdd onFork and onRename methods to RepositoryLifeCycleListener 51/251/1
James Moger [Fri, 22 May 2015 16:13:39 +0000 (12:13 -0400)]
Add onFork and onRename methods to RepositoryLifeCycleListener

9 years agoMerged #250 "Improve PAM documentation"
James Moger [Fri, 22 May 2015 15:40:40 +0000 (09:40 -0600)]
Merged #250 "Improve PAM documentation"

9 years agoImprove PAM documentation 50/250/1
James Moger [Fri, 22 May 2015 15:39:59 +0000 (11:39 -0400)]
Improve PAM documentation

9 years agoMerged #249 "Parse X509 DN with LdapName"
James Moger [Fri, 22 May 2015 15:26:15 +0000 (09:26 -0600)]
Merged #249 "Parse X509 DN with LdapName"

9 years agoParse X509 DN with LdapName 49/249/1
James Moger [Fri, 22 May 2015 15:25:37 +0000 (11:25 -0400)]
Parse X509 DN with LdapName

9 years agoMerged #248 "Deny access to /com/* url path"
James Moger [Fri, 22 May 2015 01:38:32 +0000 (19:38 -0600)]
Merged #248 "Deny access to /com/* url path"

9 years agoRemove /org/ filtering 48/248/1
James Moger [Fri, 22 May 2015 01:36:48 +0000 (21:36 -0400)]
Remove /org/ filtering

9 years agoMerged #247 "Add Kerberos5/GSS authentication to ssh"
James Moger [Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)]
Merged #247 "Add Kerberos5/GSS authentication to ssh"

9 years agoMerged #246 "Option to extract user metadata from container HTTP session"
James Moger [Fri, 22 May 2015 01:16:59 +0000 (19:16 -0600)]
Merged #246 "Option to extract user metadata from container HTTP session"

9 years agoAdded nbproject/private folder to .gitignore 260/head
Eddy Young [Wed, 20 May 2015 22:50:10 +0000 (23:50 +0100)]
Added nbproject/private folder to .gitignore

9 years agoRemoved private\ folder which is specific to each NetBeans user session
Eddy Young [Wed, 20 May 2015 22:48:17 +0000 (23:48 +0100)]
Removed private\ folder which is specific to each NetBeans user session

9 years agoAdd support for NetBeans project
Eddy Young [Wed, 20 May 2015 22:41:30 +0000 (23:41 +0100)]
Add support for NetBeans project

9 years agoA patch that allows to extract a new user informations from the HTTP session 255/head 46/246/1
Fabrice Bacchella [Fri, 15 May 2015 20:36:45 +0000 (22:36 +0200)]
A patch that allows to extract a new user informations from the HTTP session
if the webapp container can fill it.

9 years agoAdding Kerberos5/GSS authentication to ssh 254/head 47/247/1
Fabrice Bacchella [Mon, 4 May 2015 09:52:12 +0000 (11:52 +0200)]
Adding Kerberos5/GSS authentication to ssh
Adding the possibility to define authentication method order for ssh

9 years agoDeny access to /com and /org folders in GO setup 252/head
Jean-Baptiste Mayer [Tue, 14 Apr 2015 21:33:02 +0000 (22:33 +0100)]
Deny access to /com and /org folders in GO setup

Added a servlet to serve "Access Denied"
Added conditional mapping of /com and /org folders in the web setup

9 years agoMerge pull request #250 from StephenKing/doc-rpc
James Moger [Tue, 24 Mar 2015 21:03:16 +0000 (17:03 -0400)]
Merge pull request #250 from StephenKing/doc-rpc

Docs: Fix RPC URL

9 years agoDocs: Fix RPC URL 250/head
Steffen Gebert [Tue, 24 Mar 2015 20:21:13 +0000 (21:21 +0100)]
Docs: Fix RPC URL

The RPC URL should be `/rpc/?` and not `/rpc?` according to
https://groups.google.com/d/msg/gitblit/Ajp2gR3B2bM/AXg6wIf21eIJ

9 years agoUpdate Jetty to 9.2.10
James Moger [Thu, 12 Mar 2015 21:59:46 +0000 (17:59 -0400)]
Update Jetty to 9.2.10

9 years agoUpdate to SSHD 0.14
James Moger [Thu, 12 Mar 2015 13:17:06 +0000 (09:17 -0400)]
Update to SSHD 0.14

9 years agoMerged #233 "Ignore whitespace in diff viewer"
James Moger [Sat, 7 Mar 2015 17:26:23 +0000 (11:26 -0600)]
Merged #233 "Ignore whitespace in diff viewer"

9 years agoAdd a checkbox to control whitespace diff preference on the compare page 33/233/2
James Moger [Sat, 7 Mar 2015 17:21:59 +0000 (12:21 -0500)]
Add a checkbox to control whitespace diff preference on the compare page

9 years agoAdd links to commit diff and blob diff pages to toggle whitespace setting
James Moger [Sat, 7 Mar 2015 16:52:14 +0000 (11:52 -0500)]
Add links to commit diff and blob diff pages to toggle whitespace setting

9 years agoExpose the DiffComparator choice as an url parameter (?w=1)
James Moger [Sat, 7 Mar 2015 16:17:27 +0000 (11:17 -0500)]
Expose the DiffComparator choice as an url parameter (?w=1)

9 years agoAdd DiffComparator argument to all DiffUtils calls, default to ignore all whitespace
James Moger [Thu, 26 Feb 2015 17:38:17 +0000 (12:38 -0500)]
Add DiffComparator argument to all DiffUtils calls, default to ignore all whitespace

9 years agoRestore tab conversion to 4 spaces in HTML diff output
James Moger [Thu, 26 Feb 2015 17:37:11 +0000 (12:37 -0500)]
Restore tab conversion to 4 spaces in HTML diff output

9 years agoUpdate JGit to 3.7.0
James Moger [Sat, 7 Mar 2015 15:43:25 +0000 (10:43 -0500)]
Update JGit to 3.7.0

9 years agoMerged #225 "The Delete button for repositories is placed rather unfortunately"
James Moger [Sat, 7 Mar 2015 14:43:47 +0000 (08:43 -0600)]
Merged #225 "The Delete button for repositories is placed rather unfortunately"

9 years agoMove the Delete Repository button to a separate "administration" tab 25/225/1
James Moger [Sat, 7 Mar 2015 14:38:53 +0000 (09:38 -0500)]
Move the Delete Repository button to a separate "administration" tab

9 years agoMerge branch 'ticket/245' into develop
James Moger [Sat, 7 Mar 2015 14:27:05 +0000 (09:27 -0500)]
Merge branch 'ticket/245' into develop

9 years agoStrip line breaks from pasted SSH keys 45/245/1
James Moger [Sat, 7 Mar 2015 14:25:54 +0000 (09:25 -0500)]
Strip line breaks from pasted SSH keys

9 years agoMerged #244 "Implement user/team difference detection"
James Moger [Sat, 7 Mar 2015 14:09:15 +0000 (08:09 -0600)]
Merged #244 "Implement user/team difference detection"

9 years agoMerge branch 'ticket/244' into develop
James Moger [Sat, 7 Mar 2015 14:05:14 +0000 (09:05 -0500)]
Merge branch 'ticket/244' into develop

9 years agoMinor refactoring of user/team checksumming 44/244/1
James Moger [Sat, 7 Mar 2015 14:04:17 +0000 (09:04 -0500)]
Minor refactoring of user/team checksumming

9 years agoSetting up a checksum on user and team instances to lower connection delay 246/head
Pierre-yves Baloche [Fri, 6 Mar 2015 16:39:39 +0000 (17:39 +0100)]
Setting up a checksum on user and team instances to lower connection delay

9 years agoMerged #243 "Allow Forks is not saved on repository edit"
James Moger [Thu, 5 Mar 2015 14:17:34 +0000 (08:17 -0600)]
Merged #243 "Allow Forks is not saved on repository edit"

9 years agoFix failure to save Allow Forks repository setting 43/243/1
James Moger [Thu, 5 Mar 2015 14:13:24 +0000 (09:13 -0500)]
Fix failure to save Allow Forks repository setting

9 years agoUpdate SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, args4j...
James Moger [Thu, 5 Mar 2015 14:10:02 +0000 (09:10 -0500)]
Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, args4j, Jedis, waffle-jna, Unboundid

9 years agoMerged #242 "issue-545: Enforce repository permissions in patch page"
James Moger [Thu, 26 Feb 2015 16:20:23 +0000 (10:20 -0600)]
Merged #242 "issue-545: Enforce repository permissions in patch page"

9 years agoMerge branch 'ticket/242' into develop
James Moger [Thu, 26 Feb 2015 16:16:54 +0000 (11:16 -0500)]
Merge branch 'ticket/242' into develop

9 years agoissue-545: Enforce repository permissions in patch page 42/242/1
James Moger [Thu, 26 Feb 2015 16:16:01 +0000 (11:16 -0500)]
issue-545: Enforce repository permissions in patch page

9 years agoMerged #241 "issue-527: Synchronize changes from upstream Bugtraq"
James Moger [Thu, 26 Feb 2015 15:06:39 +0000 (09:06 -0600)]
Merged #241 "issue-527: Synchronize changes from upstream Bugtraq"

9 years agoMerge branch 'ticket/241' into develop
James Moger [Thu, 26 Feb 2015 15:03:06 +0000 (10:03 -0500)]
Merge branch 'ticket/241' into develop

9 years agoissue-527: Synchronize changes from upstream Bugtraq 41/241/1
James Moger [Thu, 26 Feb 2015 15:02:14 +0000 (10:02 -0500)]
issue-527: Synchronize changes from upstream Bugtraq

9 years agoMerged #240 "Fix spelling mistake" 243/head
James Moger [Thu, 26 Feb 2015 13:39:58 +0000 (07:39 -0600)]
Merged #240 "Fix spelling mistake"

9 years agoFix spelling mistake
Southparkfan [Sun, 15 Feb 2015 10:11:08 +0000 (11:11 +0100)]
Fix spelling mistake

9 years agoMerged #239 "Remote Leakage Of Shared Buffers In Jetty Web Server [CVE-2015-2080]"
James Moger [Thu, 26 Feb 2015 13:36:47 +0000 (07:36 -0600)]
Merged #239 "Remote Leakage Of Shared Buffers In Jetty Web Server [CVE-2015-2080]"

9 years agoMerge branch 'ticket/239' into develop
James Moger [Thu, 26 Feb 2015 13:33:21 +0000 (08:33 -0500)]
Merge branch 'ticket/239' into develop

9 years agoissue-566: Udpate to Jetty 9.2.9 for CVE-2015-2080 39/239/1
James Moger [Thu, 26 Feb 2015 13:29:55 +0000 (08:29 -0500)]
issue-566: Udpate to Jetty 9.2.9 for CVE-2015-2080

9 years agoMerged #238 "issue 564: enable ticket page update on tomcat with redirects"
James Moger [Thu, 26 Feb 2015 13:27:20 +0000 (07:27 -0600)]
Merged #238 "issue 564: enable ticket page update on tomcat with redirects"

9 years agoMerge branch 'ticket/238' into develop
James Moger [Thu, 26 Feb 2015 13:16:44 +0000 (08:16 -0500)]
Merge branch 'ticket/238' into develop

9 years agoissue 564: enable ticket page update on tomcat with redirects 245/head 38/238/2
krulls [Mon, 23 Feb 2015 17:24:45 +0000 (18:24 +0100)]
issue 564: enable ticket page update on tomcat with redirects

issue 564: fix imports

issue 564

9 years agoFix spelling mistake 244/head 40/240/1
Southparkfan [Sun, 15 Feb 2015 10:11:08 +0000 (11:11 +0100)]
Fix spelling mistake

9 years agoMerged #237 "Add 'UTF8' encoding alias"
James Moger [Wed, 11 Feb 2015 15:18:53 +0000 (09:18 -0600)]
Merged #237 "Add 'UTF8' encoding alias"

9 years agoMerge branch 'ticket/237' into develop
James Moger [Wed, 11 Feb 2015 15:15:47 +0000 (10:15 -0500)]
Merge branch 'ticket/237' into develop

9 years agoAdd 'UTF8' encoding alias 37/237/1
James Moger [Wed, 11 Feb 2015 15:13:56 +0000 (10:13 -0500)]
Add 'UTF8' encoding alias

9 years agoMerged #234 "#230 - Improve empty folder navigation."
James Moger [Tue, 13 Jan 2015 13:16:13 +0000 (07:16 -0600)]
Merged #234 "#230 - Improve empty folder navigation."

9 years ago#230 - Improve empty folder navigation. 241/head 34/234/1
Milos Cubrilo [Sun, 11 Jan 2015 12:41:29 +0000 (13:41 +0100)]
#230 - Improve empty folder navigation.

Empty folders are automatically skipped when browsing repository tree  (similar to github "folder jumping" feature).

9 years agoMerge pull request #240 from steveno/develop
James Moger [Sat, 3 Jan 2015 14:34:45 +0000 (09:34 -0500)]
Merge pull request #240 from steveno/develop

GitBlit no longer uses Google charts

9 years agoGitBlit no longer uses Google charts 240/head
Steven Oliver [Sat, 3 Jan 2015 02:00:52 +0000 (21:00 -0500)]
GitBlit no longer uses Google charts

9 years agoMerged #228 "Add support for configurable HTTP proxy host/port in PluginManager.java"
James Moger [Wed, 3 Dec 2014 20:21:33 +0000 (14:21 -0600)]
Merged #228 "Add support for configurable HTTP proxy host/port in PluginManager.java"

9 years agoAdd support for specifying the `Proxy-Authorization` header for the PluginManager 28/228/1
James Moger [Wed, 3 Dec 2014 20:05:49 +0000 (15:05 -0500)]
Add support for specifying the `Proxy-Authorization` header for the PluginManager

9 years agoMerged #227 "Small adjustments to allow integration with Gerrit Code Review"
James Moger [Wed, 3 Dec 2014 19:58:19 +0000 (13:58 -0600)]
Merged #227 "Small adjustments to allow integration with Gerrit Code Review"

9 years agoMerged #226 "Added a new property: web.displayUserPanel"
James Moger [Wed, 3 Dec 2014 19:47:08 +0000 (13:47 -0600)]
Merged #226 "Added a new property: web.displayUserPanel"

9 years agoUse startManager(X) from startManager(Injector, Class) 27/227/1
James Moger [Wed, 3 Dec 2014 19:42:10 +0000 (14:42 -0500)]
Use startManager(X) from startManager(Injector, Class)

9 years agoAdd support for configurable HTTP proxy host/port in PluginManager.java 235/head
Dariusz Bywalec [Tue, 2 Dec 2014 16:11:50 +0000 (17:11 +0100)]
Add support for configurable HTTP proxy host/port in PluginManager.java

Formerly by default the PluginMaganer would support no proxy setting.
For servers behind firewall and HTTP proxy this would prevent installation of gitblit plugins.

9 years agoAllow different aspect rations for top-left logo 236/head
Luca Milanesio [Sat, 29 Nov 2014 16:24:25 +0000 (16:24 +0000)]
Allow different aspect rations for top-left logo

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.

9 years agoAllows starting an already instantiated manager
Luca Milanesio [Sat, 29 Nov 2014 16:18:19 +0000 (16:18 +0000)]
Allows starting an already instantiated manager

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.

9 years agoAdded a new property: web.displayUserPanel 234/head 26/226/1
Jan Šmucr [Thu, 27 Nov 2014 13:00:48 +0000 (14:00 +0100)]
Added a new property: web.displayUserPanel

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).

9 years agoFix regression in BasePage due to changes in page construction for bottom script...
James Moger [Tue, 25 Nov 2014 14:38:58 +0000 (09:38 -0500)]
Fix regression in BasePage due to changes in page construction for bottom script injection

9 years agoAdd .bat and .cmd to the pretty print extensions
James Moger [Mon, 24 Nov 2014 14:34:46 +0000 (09:34 -0500)]
Add .bat and .cmd to the pretty print extensions

9 years agoEnsure that pretty-printed files are served as text/plain in Raw servlet
James Moger [Mon, 24 Nov 2014 14:34:27 +0000 (09:34 -0500)]
Ensure that pretty-printed files are served as text/plain in Raw servlet

9 years agoFix time units in ldap sync log message
James Moger [Mon, 24 Nov 2014 14:25:08 +0000 (09:25 -0500)]
Fix time units in ldap sync log message

9 years agoExtract WAR data resources if they do not exist in ${baseFolder}
James Moger [Mon, 24 Nov 2014 14:15:57 +0000 (09:15 -0500)]
Extract WAR data resources if they do not exist in ${baseFolder}

9 years agoRevise severity & priority permissions
James Moger [Thu, 20 Nov 2014 14:23:32 +0000 (09:23 -0500)]
Revise severity & priority permissions

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.

9 years agoMerge pull request #232 from tomaswolf/ticket-88-bugfix
James Moger [Thu, 20 Nov 2014 13:12:31 +0000 (08:12 -0500)]
Merge pull request #232 from tomaswolf/ticket-88-bugfix

Usability bug fix

9 years agoUsability bug fix 232/head
Tom [Wed, 19 Nov 2014 17:41:29 +0000 (18:41 +0100)]
Usability bug fix

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.

9 years agoMerged #223 "Add support for image/svg+xml content type to raw servlet"
James Moger [Wed, 19 Nov 2014 16:34:17 +0000 (10:34 -0600)]
Merged #223 "Add support for image/svg+xml content type to raw servlet"

9 years agoMerged #222 "Add a blink comparator and pixel difference to image diffs"
James Moger [Wed, 19 Nov 2014 16:26:12 +0000 (10:26 -0600)]
Merged #222 "Add a blink comparator and pixel difference to image diffs"

9 years agoAdd support for image/svg+xml content type to raw servlet 23/223/1
James Moger [Wed, 19 Nov 2014 16:17:59 +0000 (11:17 -0500)]
Add support for image/svg+xml content type to raw servlet

9 years agoAdd a blink comparator and pixel difference to image diffs 231/head 22/222/1
Tom [Mon, 17 Nov 2014 23:25:41 +0000 (00:25 +0100)]
Add a blink comparator and pixel difference to image diffs

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

9 years agoMerge pull request #230 from tomaswolf/ticket-88-followup
James Moger [Tue, 18 Nov 2014 15:55:25 +0000 (10:55 -0500)]
Merge pull request #230 from tomaswolf/ticket-88-followup

IE < 10 does not support gradients.

9 years agoIE < 10 does not support gradients. 230/head
Tom [Mon, 17 Nov 2014 15:31:46 +0000 (16:31 +0100)]
IE < 10 does not support gradients.

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.

9 years agoMerged #88 "Image diff could display before & after images"
James Moger [Mon, 17 Nov 2014 14:06:34 +0000 (08:06 -0600)]
Merged #88 "Image diff could display before & after images"

9 years agoMake the sliders clickable. 229/head 88/88/1
Tom [Sat, 15 Nov 2014 19:04:48 +0000 (20:04 +0100)]
Make the sliders clickable.

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.

9 years agoMinor corrections in Javascript
Tom [Sat, 15 Nov 2014 00:09:47 +0000 (01:09 +0100)]
Minor corrections in Javascript

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.

9 years agoJavascript-based sliders styled with CSS
Tom [Fri, 14 Nov 2014 21:14:28 +0000 (22:14 +0100)]
Javascript-based sliders styled with CSS

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.)

9 years agoFix that opacity slider
Tom [Thu, 13 Nov 2014 20:57:50 +0000 (21:57 +0100)]
Fix that opacity slider

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.

9 years agoTypo in comment, and optional semicolon in JS
Tom [Thu, 13 Nov 2014 07:41:25 +0000 (08:41 +0100)]
Typo in comment, and optional semicolon in JS

9 years agoOpacity adjustments for image diffs
Tom [Wed, 12 Nov 2014 19:31:12 +0000 (20:31 +0100)]
Opacity adjustments for image diffs

* 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.

9 years agoHTML bug fix on the blob page
Tom [Wed, 12 Nov 2014 19:27:17 +0000 (20:27 +0100)]
HTML bug fix on the blob page

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.

9 years agoSupport for adding bottom scripts
Tom [Wed, 12 Nov 2014 19:19:29 +0000 (20:19 +0100)]
Support for adding bottom scripts

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.

9 years agoImage diffs
Tom [Tue, 11 Nov 2014 06:52:15 +0000 (07:52 +0100)]
Image diffs

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.

9 years agoMerged #221 "Update GitBlitWebApp_nl.properties"
James Moger [Tue, 11 Nov 2014 03:40:52 +0000 (21:40 -0600)]
Merged #221 "Update GitBlitWebApp_nl.properties"

9 years agoMerge branch 'ticket/221' into develop
James Moger [Tue, 11 Nov 2014 03:26:25 +0000 (22:26 -0500)]
Merge branch 'ticket/221' into develop

9 years agoMerged #220 "Improve the diff page"
James Moger [Tue, 11 Nov 2014 03:30:17 +0000 (21:30 -0600)]
Merged #220 "Improve the diff page"

9 years agoAdd min-width in .diff-line CSS 226/head 20/220/1
Tom [Thu, 6 Nov 2014 21:53:38 +0000 (22:53 +0100)]
Add min-width in .diff-line CSS

To ensure the line number columns never get squashed.

9 years agoFix a copy/paste error in a comment.
Tom [Wed, 29 Oct 2014 15:23:04 +0000 (16:23 +0100)]
Fix a copy/paste error in a comment.

9 years agoCSS changes.
Tom [Wed, 29 Oct 2014 13:50:52 +0000 (14:50 +0100)]
CSS changes.

- 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.