]> source.dussan.org Git - gitblit.git/log
gitblit.git
9 years agoUpdate to Guice 4.0-beta5 19/219/1
James Moger [Wed, 5 Nov 2014 03:50:27 +0000 (22:50 -0500)]
Update to Guice 4.0-beta5

9 years agoMerged #218 "Update to SSHD 0.13.0"
James Moger [Wed, 5 Nov 2014 03:58:57 +0000 (21:58 -0600)]
Merged #218 "Update to SSHD 0.13.0"

9 years agoUpdate to SSHD 0.13.0 18/218/1
James Moger [Wed, 5 Nov 2014 03:45:21 +0000 (22:45 -0500)]
Update to SSHD 0.13.0

9 years agoMerged #217 "Exclude SSLv3 from Gitblit GO https protocols"
James Moger [Tue, 4 Nov 2014 22:38:17 +0000 (16:38 -0600)]
Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

9 years agoMerged #216 "Whitelist the "target" link attribute in the XSS filter"
James Moger [Tue, 4 Nov 2014 22:26:07 +0000 (16:26 -0600)]
Merged #216 "Whitelist the "target" link attribute in the XSS filter"

9 years agoExclude SSLv3 from Gitblit GO https protocols 17/217/1
James Moger [Tue, 4 Nov 2014 22:20:31 +0000 (17:20 -0500)]
Exclude SSLv3 from Gitblit GO https protocols

9 years agoWhitelist the "target" link attribute in the XSS filter 16/216/1
James Moger [Tue, 4 Nov 2014 22:12:00 +0000 (17:12 -0500)]
Whitelist the "target" link attribute in the XSS filter

9 years agoMerge pull request #227 from bviktor/develop
James Moger [Fri, 31 Oct 2014 21:05:25 +0000 (17:05 -0400)]
Merge pull request #227 from bviktor/develop

Miscellaneous fixes to the Fedora service installer script

9 years agoMiscellaneous fixes to the Fedora service installer script 227/head
Berke Viktor [Fri, 31 Oct 2014 19:04:34 +0000 (20:04 +0100)]
Miscellaneous fixes to the Fedora service installer script

9 years agoMerged #215 "Allow finer-grained determination of available transport preferences"
James Moger [Fri, 31 Oct 2014 14:50:19 +0000 (08:50 -0600)]
Merged #215 "Allow finer-grained determination of available transport preferences"

9 years agoAllow finer-grained determination of available transport preferences 15/215/1
James Moger [Fri, 31 Oct 2014 14:36:52 +0000 (10:36 -0400)]
Allow finer-grained determination of available transport preferences

9 years agoMerged #214 "Only set mutable user access permissions"
James Moger [Fri, 31 Oct 2014 14:06:17 +0000 (08:06 -0600)]
Merged #214 "Only set mutable user access permissions"

9 years agoOnly set mutable user access permissions 14/214/1
James Moger [Fri, 31 Oct 2014 13:52:02 +0000 (09:52 -0400)]
Only set mutable user access permissions

9 years agoMerged #213 "Fix exception in FileTicketService when deleting a repository"
James Moger [Fri, 31 Oct 2014 13:32:28 +0000 (07:32 -0600)]
Merged #213 "Fix exception in FileTicketService when deleting a repository"

9 years agoMerged #212 "Gracefully handle missing integration branch in ticket page"
James Moger [Fri, 31 Oct 2014 13:22:01 +0000 (07:22 -0600)]
Merged #212 "Gracefully handle missing integration branch in ticket page"

9 years agoFix exception in FileTicketService when deleting a repository 13/213/1
James Moger [Fri, 31 Oct 2014 13:19:03 +0000 (09:19 -0400)]
Fix exception in FileTicketService when deleting a repository

9 years agoGracefully handle missing integration branch in ticket page 12/212/1
James Moger [Fri, 31 Oct 2014 13:08:37 +0000 (09:08 -0400)]
Gracefully handle missing integration branch in ticket page

9 years agoMerge release 1.6.2
James Moger [Tue, 28 Oct 2014 13:55:10 +0000 (09:55 -0400)]
Merge release 1.6.2

9 years agoPrepare 1.6.2 release v1.6.2
James Moger [Tue, 28 Oct 2014 13:30:18 +0000 (09:30 -0400)]
Prepare 1.6.2 release

9 years agoDocumentation
James Moger [Mon, 27 Oct 2014 15:28:03 +0000 (11:28 -0400)]
Documentation

9 years agoFix PluginManager not properly respecting --noverify
James Moger [Mon, 27 Oct 2014 14:46:05 +0000 (10:46 -0400)]
Fix PluginManager not properly respecting --noverify

9 years agoMerged #110 "Support multiple/chained config files"
James Moger [Mon, 27 Oct 2014 14:21:09 +0000 (08:21 -0600)]
Merged #110 "Support multiple/chained config files"

9 years agoAdopt chain-loading properties as the default setup 10/110/1
James Moger [Mon, 27 Oct 2014 12:58:39 +0000 (08:58 -0400)]
Adopt chain-loading properties as the default setup

9 years agoMerged #211 "Fix raw servlet trashing paths with spaces"
James Moger [Sun, 26 Oct 2014 14:30:03 +0000 (08:30 -0600)]
Merged #211 "Fix raw servlet trashing paths with spaces"

9 years agoMerge branch 'ticket/211' into develop
James Moger [Sun, 26 Oct 2014 14:20:43 +0000 (10:20 -0400)]
Merge branch 'ticket/211' into develop

9 years agoFix raw servlet trashing paths with spaces 11/211/1
James Moger [Sun, 26 Oct 2014 14:16:49 +0000 (10:16 -0400)]
Fix raw servlet trashing paths with spaces

9 years agoSupported include keys in gitblit.properties
James Moger [Sun, 26 Oct 2014 14:09:50 +0000 (10:09 -0400)]
Supported include keys in gitblit.properties

This allows you to build a hierarchy of properties files or for a properties file
to include default settings.

9 years agoMerged #209 "Plugin manager does not completely respect --noverify"
James Moger [Thu, 23 Oct 2014 21:37:07 +0000 (15:37 -0600)]
Merged #209 "Plugin manager does not completely respect --noverify"

9 years agoFix broken implementation of --noverify for installing a plugin from a url 09/209/1
James Moger [Thu, 23 Oct 2014 21:20:42 +0000 (17:20 -0400)]
Fix broken implementation of --noverify for installing a plugin from a url

9 years agoDocumentation
James Moger [Thu, 23 Oct 2014 21:15:36 +0000 (17:15 -0400)]
Documentation

9 years agoSmall adjustment to FilterableRepositoryList css classes
James Moger [Thu, 23 Oct 2014 19:40:02 +0000 (15:40 -0400)]
Small adjustment to FilterableRepositoryList css classes

9 years agoMerged #106 "Consider integrating GitHub Octicons"
James Moger [Thu, 23 Oct 2014 19:42:25 +0000 (13:42 -0600)]
Merged #106 "Consider integrating GitHub Octicons"

9 years agoIntegrate GitHub Octicons 06/106/1
James Moger [Thu, 23 Oct 2014 19:28:39 +0000 (15:28 -0400)]
Integrate GitHub Octicons

9 years agoDocumentation
James Moger [Wed, 22 Oct 2014 12:21:19 +0000 (08:21 -0400)]
Documentation

9 years agoMerged #210 "Use unicode in french translation"
James Moger [Wed, 22 Oct 2014 12:31:23 +0000 (06:31 -0600)]
Merged #210 "Use unicode in french translation"

9 years agoMerge branch 'ticket/210' into develop
James Moger [Wed, 22 Oct 2014 12:06:25 +0000 (08:06 -0400)]
Merge branch 'ticket/210' into develop

9 years agoUse unicode in french translation 224/head 10/210/1
ptemplier [Tue, 21 Oct 2014 22:27:10 +0000 (00:27 +0200)]
Use unicode in french translation

translated using native2ascii

9 years agoFix critical severity dot positioning
James Moger [Tue, 21 Oct 2014 19:02:13 +0000 (15:02 -0400)]
Fix critical severity dot positioning

9 years agoDocumentation
James Moger [Tue, 21 Oct 2014 17:41:17 +0000 (13:41 -0400)]
Documentation

9 years agoMerged #157 "Add Priority & Severity fields to the ticket model"
James Moger [Tue, 21 Oct 2014 17:43:43 +0000 (11:43 -0600)]
Merged #157 "Add Priority & Severity fields to the ticket model"

9 years agoRemove S# text, set severity in tooltip 57/157/2
James Moger [Tue, 21 Oct 2014 17:28:15 +0000 (13:28 -0400)]
Remove S# text, set severity in tooltip

9 years agoAdjust priority & severity CSS
James Moger [Tue, 21 Oct 2014 13:33:29 +0000 (09:33 -0400)]
Adjust priority & severity CSS

- Severity: more severe are ROY, less severe are GB
- Replaced first-letter of severity with S# and show # dots
- Priority: higher priorityare RO, lower priority is B

I really like the 'C, 'CA' idea but that will definitely lead to translation questions. The S# approach will still generate the same complaints, but at least it is more generic.

9 years agoTickets - Priority, Severity options 220/head
Paul Martin [Mon, 29 Sep 2014 21:10:20 +0000 (22:10 +0100)]
Tickets - Priority, Severity options

+ Severity indicated via new character indicator and color of ticket icon on ticket list
+ Priority indicated via new priority icon and color on ticket list
+ Indexed as integers to provide sorting and maintain language neutral
index
+ Colours and indicator text controlled through CSS classes priority-<x> & severity-<x>
+ UITicketTest created to generate tickets of all types to ease debugging

9 years agoMerge release-1.6.1
James Moger [Mon, 20 Oct 2014 20:42:43 +0000 (16:42 -0400)]
Merge release-1.6.1

9 years agoReset build identifiers for next point release cycle
James Moger [Mon, 20 Oct 2014 20:31:17 +0000 (16:31 -0400)]
Reset build identifiers for next point release cycle

9 years agoMerge release 1.6.1
James Moger [Mon, 20 Oct 2014 20:31:14 +0000 (16:31 -0400)]
Merge release 1.6.1

9 years agoPrepare 1.6.1 release v1.6.1
James Moger [Mon, 20 Oct 2014 20:17:39 +0000 (16:17 -0400)]
Prepare 1.6.1 release

9 years agoCorrect unit test assertion
James Moger [Mon, 20 Oct 2014 15:10:37 +0000 (11:10 -0400)]
Correct unit test assertion

9 years agoDocumentation updates
James Moger [Mon, 20 Oct 2014 13:40:31 +0000 (09:40 -0400)]
Documentation updates

9 years agoPrepare v1.6.1 documentation updates
James Moger [Mon, 20 Oct 2014 13:33:07 +0000 (09:33 -0400)]
Prepare v1.6.1 documentation updates

9 years agoMerged #206 "New Ticket Type - Maintenance"
James Moger [Mon, 20 Oct 2014 02:14:47 +0000 (20:14 -0600)]
Merged #206 "New Ticket Type - Maintenance"

9 years agoNew Ticket Type - Maintenance 06/206/1
Paul Martin [Sat, 18 Oct 2014 16:56:43 +0000 (17:56 +0100)]
New Ticket Type - Maintenance

+ Indended for identifiying and loggin maintenance of development tools
and systems to provide an integrated means to satisfy ISO requirements

+ Improved alignment of query icons via fixed width attribute

10 years agoMerged #205 "Update to JGit 3.5.1"
James Moger [Tue, 14 Oct 2014 17:48:49 +0000 (11:48 -0600)]
Merged #205 "Update to JGit 3.5.1"

10 years agoMerge branch 'ticket/205' into develop
James Moger [Tue, 14 Oct 2014 17:35:51 +0000 (13:35 -0400)]
Merge branch 'ticket/205' into develop

10 years agoUpdate to JGit 3.5.1 05/205/1
James Moger [Tue, 14 Oct 2014 17:18:58 +0000 (13:18 -0400)]
Update to JGit 3.5.1

10 years agoFix GitBlitTest.testGitblitSettings()
James Moger [Mon, 13 Oct 2014 23:08:30 +0000 (19:08 -0400)]
Fix GitBlitTest.testGitblitSettings()

10 years agoFix backslash regression in relative path determiniation
James Moger [Mon, 13 Oct 2014 22:06:28 +0000 (18:06 -0400)]
Fix backslash regression in relative path determiniation

10 years agoFix potential NPE when excluding last change author
James Moger [Mon, 13 Oct 2014 23:16:51 +0000 (19:16 -0400)]
Fix potential NPE when excluding last change author

10 years agoFix GitBlitTest.testGitblitSettings()
James Moger [Mon, 13 Oct 2014 23:08:30 +0000 (19:08 -0400)]
Fix GitBlitTest.testGitblitSettings()

10 years agoFix backslash regression in relative path determiniation
James Moger [Mon, 13 Oct 2014 22:06:28 +0000 (18:06 -0400)]
Fix backslash regression in relative path determiniation

10 years agoMerged #204 "Improve relative path determination using Java 7 Paths"
James Moger [Fri, 10 Oct 2014 16:17:31 +0000 (10:17 -0600)]
Merged #204 "Improve relative path determination using Java 7 Paths"

10 years agoMerge branch 'ticket/204' into develop
James Moger [Fri, 10 Oct 2014 16:05:54 +0000 (12:05 -0400)]
Merge branch 'ticket/204' into develop

10 years agoImprove relative path determination using Java 7 Paths 04/204/1
James Moger [Fri, 10 Oct 2014 16:04:39 +0000 (12:04 -0400)]
Improve relative path determination using Java 7 Paths

10 years agoMerged #203 "Bug in the rawservlet in extracting the repository out of the path"
James Moger [Tue, 7 Oct 2014 12:15:43 +0000 (06:15 -0600)]
Merged #203 "Bug in the rawservlet in extracting the repository out of the path"

10 years agoMerge branch 'ticket/203' into develop
James Moger [Tue, 7 Oct 2014 12:00:15 +0000 (08:00 -0400)]
Merge branch 'ticket/203' into develop

10 years agoBug in the rawservlet in extracting the repository out of the path. The 222/head 03/203/1
Robbert Noordzij [Tue, 7 Oct 2014 10:14:27 +0000 (12:14 +0200)]
Bug in the rawservlet in extracting the repository out of the path. The
offset for finding the next slash should be the current slash + 1, not
the last offset + the offset of the current slash.

10 years agoMerged #202 "Treat .ico and .jpeg files as images"
James Moger [Mon, 6 Oct 2014 18:00:24 +0000 (12:00 -0600)]
Merged #202 "Treat .ico and .jpeg files as images"

10 years agoMerge branch 'ticket/202' into develop
James Moger [Mon, 6 Oct 2014 17:49:08 +0000 (13:49 -0400)]
Merge branch 'ticket/202' into develop

10 years agoTreat .ico and .jpeg files as images 02/202/1
Berke Viktor [Fri, 3 Oct 2014 13:35:56 +0000 (15:35 +0200)]
Treat .ico and .jpeg files as images

10 years agoMerged #129 "Eliminate Wicket references from non-Wicket packages"
James Moger [Tue, 30 Sep 2014 16:54:40 +0000 (10:54 -0600)]
Merged #129 "Eliminate Wicket references from non-Wicket packages"

10 years agoMerge branch 'ticket/129' into develop
James Moger [Tue, 30 Sep 2014 16:43:59 +0000 (12:43 -0400)]
Merge branch 'ticket/129' into develop

10 years agoRemove Wicket references from non-Wicket packages 29/129/2
James Moger [Fri, 4 Jul 2014 00:19:39 +0000 (20:19 -0400)]
Remove Wicket references from non-Wicket packages

10 years agoMerged #201 "Remove git.streamFileThreshold setting"
James Moger [Tue, 30 Sep 2014 16:01:56 +0000 (10:01 -0600)]
Merged #201 "Remove git.streamFileThreshold setting"

10 years agoMerge branch 'ticket/201' into develop
James Moger [Tue, 30 Sep 2014 15:52:43 +0000 (11:52 -0400)]
Merge branch 'ticket/201' into develop

10 years agoRemove git.streamFileThreshold setting 01/201/1
James Moger [Tue, 1 Jul 2014 15:02:54 +0000 (11:02 -0400)]
Remove git.streamFileThreshold setting

10 years agoMerged #200 "Update to Jetty 9.2.3.v20140905"
James Moger [Tue, 30 Sep 2014 15:09:33 +0000 (09:09 -0600)]
Merged #200 "Update to Jetty 9.2.3.v20140905"

10 years agoMerged #199 "Update to SSHD 0.12.0"
James Moger [Tue, 30 Sep 2014 15:00:35 +0000 (09:00 -0600)]
Merged #199 "Update to SSHD 0.12.0"

10 years agoMerge branch 'ticket/200' into develop
James Moger [Tue, 30 Sep 2014 14:58:43 +0000 (10:58 -0400)]
Merge branch 'ticket/200' into develop

10 years agoMerged #198 "Update to JGit 3.5.0.201409260305-r"
James Moger [Tue, 30 Sep 2014 14:56:10 +0000 (08:56 -0600)]
Merged #198 "Update to JGit 3.5.0.201409260305-r"

10 years agoUpdate to Jetty 9.2.3.v20140905 00/200/1
James Moger [Tue, 30 Sep 2014 14:55:38 +0000 (10:55 -0400)]
Update to Jetty 9.2.3.v20140905

10 years agoMerge branch 'ticket/199' into develop
James Moger [Tue, 30 Sep 2014 14:49:01 +0000 (10:49 -0400)]
Merge branch 'ticket/199' into develop

10 years agoUpdate to SSHD 0.12.0 99/199/1
James Moger [Tue, 30 Sep 2014 14:48:19 +0000 (10:48 -0400)]
Update to SSHD 0.12.0

10 years agoMerge branch 'ticket/198' into develop
James Moger [Tue, 30 Sep 2014 14:45:02 +0000 (10:45 -0400)]
Merge branch 'ticket/198' into develop

10 years agoUpdate to JGit 3.5.0.201409260305-r 98/198/1
James Moger [Tue, 30 Sep 2014 14:39:45 +0000 (10:39 -0400)]
Update to JGit 3.5.0.201409260305-r

10 years agoMerged #197 "Fix cropped ticket status indicator"
James Moger [Tue, 30 Sep 2014 14:16:56 +0000 (08:16 -0600)]
Merged #197 "Fix cropped ticket status indicator"

10 years agoMerge branch 'ticket/197' into develop
James Moger [Tue, 30 Sep 2014 14:05:49 +0000 (10:05 -0400)]
Merge branch 'ticket/197' into develop

10 years agoFix cropped ticket status indicator 97/197/1
James Moger [Tue, 30 Sep 2014 14:05:27 +0000 (10:05 -0400)]
Fix cropped ticket status indicator

10 years agoMerged #196 "Hack/workaround Bootstrap responsive behavior for ticket dropdowns"
James Moger [Tue, 30 Sep 2014 13:59:19 +0000 (07:59 -0600)]
Merged #196 "Hack/workaround Bootstrap responsive behavior for ticket dropdowns"

10 years agoMerge branch 'ticket/196' into develop
James Moger [Tue, 30 Sep 2014 13:48:27 +0000 (09:48 -0400)]
Merge branch 'ticket/196' into develop

10 years agoHack/workaround Bootstrap responsive behavior for ticket dropdowns 96/196/1
James Moger [Tue, 30 Sep 2014 13:47:56 +0000 (09:47 -0400)]
Hack/workaround Bootstrap responsive behavior for ticket dropdowns

This is a temporary solution.  A better fix would be to update to Bootstrap 3 and replace the dropdown with a filterable dropdown - but that is a much larger change than this quick patch.

10 years agoMerged #195 "Rename redirect method"
James Moger [Tue, 30 Sep 2014 13:34:10 +0000 (07:34 -0600)]
Merged #195 "Rename redirect method"

10 years agoMerge branch 'ticket/195' into develop
James Moger [Tue, 30 Sep 2014 13:23:25 +0000 (09:23 -0400)]
Merge branch 'ticket/195' into develop

10 years agoRename redirect method 95/195/1
James Moger [Tue, 30 Sep 2014 13:22:37 +0000 (09:22 -0400)]
Rename redirect method

10 years agoMerged #136 "Tomcat hates redirects after ajax form submissions"
James Moger [Tue, 30 Sep 2014 12:14:57 +0000 (06:14 -0600)]
Merged #136 "Tomcat hates redirects after ajax form submissions"

10 years agoMerge branch 'ticket/136' into develop
James Moger [Tue, 30 Sep 2014 12:08:58 +0000 (08:08 -0400)]
Merge branch 'ticket/136' into develop

10 years agoMerge branch 'ticket/194' into develop
James Moger [Tue, 30 Sep 2014 12:08:35 +0000 (08:08 -0400)]
Merge branch 'ticket/194' into develop

10 years agoMerge branch 'ticket/193' into develop
James Moger [Tue, 30 Sep 2014 12:07:59 +0000 (08:07 -0400)]
Merge branch 'ticket/193' into develop

10 years agoMerged #194 "Register BouncyCastle as a JCE provider"
James Moger [Tue, 30 Sep 2014 12:06:58 +0000 (06:06 -0600)]
Merged #194 "Register BouncyCastle as a JCE provider"

10 years agoMerged #193 "Support GITBLIT_HOME as a system property and environment variable"
James Moger [Tue, 30 Sep 2014 12:04:08 +0000 (06:04 -0600)]
Merged #193 "Support GITBLIT_HOME as a system property and environment variable"

10 years agoBypass Wicket redirects after AJAX form submissions, they break Tomcat 36/136/1
James Moger [Tue, 30 Sep 2014 12:01:39 +0000 (08:01 -0400)]
Bypass Wicket redirects after AJAX form submissions, they break Tomcat