]> source.dussan.org Git - gitblit.git/log
gitblit.git
9 years agoallow configuring of internal URLs offered 274/head 56/256/1
Joel Johnson [Fri, 12 Jun 2015 23:46:31 +0000 (17:46 -0600)]
allow configuring of internal URLs offered

9 years agoMerged #57 "My Tickets needs a repository filter" 271/head
James Moger [Wed, 27 May 2015 12:12:49 +0000 (06:12 -0600)]
Merged #57 "My Tickets needs a repository filter"

9 years agoMerged #255 "Invalid kerberos patches, works now and with a test."
James Moger [Wed, 27 May 2015 11:50:02 +0000 (05:50 -0600)]
Merged #255 "Invalid kerberos patches, works now and with a test."

9 years agoInvalid kerberos patches, works now and with a test. 265/head 55/255/2
Fabrice Bacchella [Mon, 25 May 2015 21:02:13 +0000 (23:02 +0200)]
Invalid kerberos patches, works now and with a test.

9 years agoMerged #254 "Two slight improvement for custom UserService"
James Moger [Tue, 26 May 2015 12:37:10 +0000 (06:37 -0600)]
Merged #254 "Two slight improvement for custom UserService"

9 years agoTwo slight improvement for custom UserService: 264/head 54/254/1
Fabrice Bacchella [Tue, 26 May 2015 08:48:40 +0000 (10:48 +0200)]
Two slight improvement for custom UserService:
- try userRealm as a file only if class is not found, other exeptions are real error
- log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString

9 years agoMerge pull request #262 from fbacchella/keepsession
James Moger [Sun, 24 May 2015 14:16:45 +0000 (10:16 -0400)]
Merge pull request #262 from fbacchella/keepsession

Do not replace session when authentication type is CONTAINER

9 years agoCreate web.rewriteSession key for use with tomcat and CAS 262/head
Fabrice Bacchella [Sat, 23 May 2015 12:16:03 +0000 (14:16 +0200)]
Create web.rewriteSession key for use with tomcat  and CAS

9 years agoApplied changes according to code review comments. 259/head 57/57/1
Eddy Young [Sat, 23 May 2015 17:50:53 +0000 (18:50 +0100)]
Applied changes according to code review comments.

Removed default "watchedby" filter so that the default now includes "createdby", "responsible", watchedby" and "mention"

9 years agoChanged the repository filter options to those related to the tickets owned by the...
Eddy Young [Fri, 22 May 2015 21:01:28 +0000 (22:01 +0100)]
Changed the repository filter options to those related to the tickets owned by the user.

Also, minor refactoring to avoid code duplication.

9 years agoFix html raw content type serving
James Moger [Fri, 22 May 2015 18:08:30 +0000 (14:08 -0400)]
Fix html raw content type serving

9 years agoMerged #253 "Implement configurable tab length support for blob views"
James Moger [Fri, 22 May 2015 17:39:49 +0000 (11:39 -0600)]
Merged #253 "Implement configurable tab length support for blob views"

9 years agoImplement configurable tab length support for blob views 53/253/1
James Moger [Fri, 22 May 2015 17:39:17 +0000 (13:39 -0400)]
Implement configurable tab length support for blob views

9 years agoMerged #252 "Cleanup diff rename output"
James Moger [Fri, 22 May 2015 16:45:34 +0000 (10:45 -0600)]
Merged #252 "Cleanup diff rename output"

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 agoReplaced repository name as search criterion with repository id
Eddy Young [Fri, 22 May 2015 10:08:26 +0000 (11:08 +0100)]
Replaced repository name as search criterion with repository id

9 years agoMerge branch 'develop' into ticket-57_develop
Eddy Young [Fri, 22 May 2015 07:47:09 +0000 (08:47 +0100)]
Merge branch 'develop' into ticket-57_develop

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 agoImplemented ticket-57
Eddy Young [Tue, 19 May 2015 22:55:54 +0000 (23:55 +0100)]
Implemented ticket-57

9 years agoImplemented filtering by repository for the My Tickets page 258/head
Eddy Young [Tue, 19 May 2015 21:30:54 +0000 (22:30 +0100)]
Implemented filtering by repository for the My Tickets page

9 years agoMore changes
Eddy Young [Tue, 19 May 2015 20:02:46 +0000 (21:02 +0100)]
More changes

9 years agoInitial changes for ticket-57
Eddy Young [Mon, 18 May 2015 20:11:27 +0000 (21:11 +0100)]
Initial changes for ticket-57

Added tags to .gitignore

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 agoMerged #245 "Strip line breaks from pasted SSH keys"
James Moger [Sat, 7 Mar 2015 14:30:58 +0000 (08:30 -0600)]
Merged #245 "Strip line breaks from pasted SSH keys"

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"