]>
source.dussan.org Git - gitblit.git/log
James Moger [Tue, 14 Oct 2014 17:35:51 +0000 (13:35 -0400)]
Merge branch 'ticket/205' into develop
James Moger [Tue, 14 Oct 2014 17:18:58 +0000 (13:18 -0400)]
Update to JGit 3.5.1
James Moger [Mon, 13 Oct 2014 23:08:30 +0000 (19:08 -0400)]
Fix GitBlitTest.testGitblitSettings()
James Moger [Mon, 13 Oct 2014 22:06:28 +0000 (18:06 -0400)]
Fix backslash regression in relative path determiniation
James Moger [Mon, 13 Oct 2014 23:16:51 +0000 (19:16 -0400)]
Fix potential NPE when excluding last change author
James Moger [Mon, 13 Oct 2014 23:08:30 +0000 (19:08 -0400)]
Fix GitBlitTest.testGitblitSettings()
James Moger [Mon, 13 Oct 2014 22:06:28 +0000 (18:06 -0400)]
Fix backslash regression in relative path determiniation
James Moger [Fri, 10 Oct 2014 16:17:31 +0000 (10:17 -0600)]
Merged #204 "Improve relative path determination using Java 7 Paths"
James Moger [Fri, 10 Oct 2014 16:05:54 +0000 (12:05 -0400)]
Merge branch 'ticket/204' into develop
James Moger [Fri, 10 Oct 2014 16:04:39 +0000 (12:04 -0400)]
Improve relative path determination using Java 7 Paths
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"
James Moger [Tue, 7 Oct 2014 12:00:15 +0000 (08:00 -0400)]
Merge branch 'ticket/203' into develop
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.
James Moger [Mon, 6 Oct 2014 18:00:24 +0000 (12:00 -0600)]
Merged #202 "Treat .ico and .jpeg files as images"
James Moger [Mon, 6 Oct 2014 17:49:08 +0000 (13:49 -0400)]
Merge branch 'ticket/202' into develop
Berke Viktor [Fri, 3 Oct 2014 13:35:56 +0000 (15:35 +0200)]
Treat .ico and .jpeg files as images
James Moger [Tue, 30 Sep 2014 16:54:40 +0000 (10:54 -0600)]
Merged #129 "Eliminate Wicket references from non-Wicket packages"
James Moger [Tue, 30 Sep 2014 16:43:59 +0000 (12:43 -0400)]
Merge branch 'ticket/129' into develop
James Moger [Fri, 4 Jul 2014 00:19:39 +0000 (20:19 -0400)]
Remove Wicket references from non-Wicket packages
James Moger [Tue, 30 Sep 2014 16:01:56 +0000 (10:01 -0600)]
Merged #201 "Remove git.streamFileThreshold setting"
James Moger [Tue, 30 Sep 2014 15:52:43 +0000 (11:52 -0400)]
Merge branch 'ticket/201' into develop
James Moger [Tue, 1 Jul 2014 15:02:54 +0000 (11:02 -0400)]
Remove git.streamFileThreshold setting
James Moger [Tue, 30 Sep 2014 15:09:33 +0000 (09:09 -0600)]
Merged #200 "Update to Jetty 9.2.3.v20140905"
James Moger [Tue, 30 Sep 2014 15:00:35 +0000 (09:00 -0600)]
Merged #199 "Update to SSHD 0.12.0"
James Moger [Tue, 30 Sep 2014 14:58:43 +0000 (10:58 -0400)]
Merge branch 'ticket/200' into develop
James Moger [Tue, 30 Sep 2014 14:56:10 +0000 (08:56 -0600)]
Merged #198 "Update to JGit 3.5.0.
201409260305 -r"
James Moger [Tue, 30 Sep 2014 14:55:38 +0000 (10:55 -0400)]
Update to Jetty 9.2.3.v20140905
James Moger [Tue, 30 Sep 2014 14:49:01 +0000 (10:49 -0400)]
Merge branch 'ticket/199' into develop
James Moger [Tue, 30 Sep 2014 14:48:19 +0000 (10:48 -0400)]
Update to SSHD 0.12.0
James Moger [Tue, 30 Sep 2014 14:45:02 +0000 (10:45 -0400)]
Merge branch 'ticket/198' into develop
James Moger [Tue, 30 Sep 2014 14:39:45 +0000 (10:39 -0400)]
Update to JGit 3.5.0.
201409260305 -r
James Moger [Tue, 30 Sep 2014 14:16:56 +0000 (08:16 -0600)]
Merged #197 "Fix cropped ticket status indicator"
James Moger [Tue, 30 Sep 2014 14:05:49 +0000 (10:05 -0400)]
Merge branch 'ticket/197' into develop
James Moger [Tue, 30 Sep 2014 14:05:27 +0000 (10:05 -0400)]
Fix cropped ticket status indicator
James Moger [Tue, 30 Sep 2014 13:59:19 +0000 (07:59 -0600)]
Merged #196 "Hack/workaround Bootstrap responsive behavior for ticket dropdowns"
James Moger [Tue, 30 Sep 2014 13:48:27 +0000 (09:48 -0400)]
Merge branch 'ticket/196' into develop
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.
James Moger [Tue, 30 Sep 2014 13:34:10 +0000 (07:34 -0600)]
Merged #195 "Rename redirect method"
James Moger [Tue, 30 Sep 2014 13:23:25 +0000 (09:23 -0400)]
Merge branch 'ticket/195' into develop
James Moger [Tue, 30 Sep 2014 13:22:37 +0000 (09:22 -0400)]
Rename redirect method
James Moger [Tue, 30 Sep 2014 12:14:57 +0000 (06:14 -0600)]
Merged #136 "Tomcat hates redirects after ajax form submissions"
James Moger [Tue, 30 Sep 2014 12:08:58 +0000 (08:08 -0400)]
Merge branch 'ticket/136' into develop
James Moger [Tue, 30 Sep 2014 12:08:35 +0000 (08:08 -0400)]
Merge branch 'ticket/194' into develop
James Moger [Tue, 30 Sep 2014 12:07:59 +0000 (08:07 -0400)]
Merge branch 'ticket/193' into develop
James Moger [Tue, 30 Sep 2014 12:06:58 +0000 (06:06 -0600)]
Merged #194 "Register BouncyCastle as a JCE provider"
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"
James Moger [Tue, 30 Sep 2014 12:01:39 +0000 (08:01 -0400)]
Bypass Wicket redirects after AJAX form submissions, they break Tomcat
James Moger [Tue, 30 Sep 2014 11:54:51 +0000 (07:54 -0400)]
Register BouncyCastle as a JCE provider
James Moger [Tue, 30 Sep 2014 11:51:31 +0000 (07:51 -0400)]
Support GITBLIT_HOME as a system property and environment variable
James Moger [Mon, 29 Sep 2014 14:12:27 +0000 (08:12 -0600)]
Merged #192 "Tweak styling of clear cache & new repository links on repositories panel"
James Moger [Mon, 29 Sep 2014 14:01:35 +0000 (10:01 -0400)]
Merge branch 'ticket/192' into develop
James Moger [Mon, 29 Sep 2014 13:57:01 +0000 (09:57 -0400)]
Tweak styling of clear cache & new repository links on repositories panel
James Moger [Fri, 26 Sep 2014 15:23:17 +0000 (09:23 -0600)]
Merged #190 "Extract authenticate method from CachingPublicKeyAuthenticator"
James Moger [Fri, 26 Sep 2014 14:49:39 +0000 (10:49 -0400)]
Renamed class to avoid confusion with FileKeyManager
James Moger [Fri, 26 Sep 2014 14:01:07 +0000 (08:01 -0600)]
Merged #191 "Allow authentication providers to control user and team role changes"
James Moger [Fri, 26 Sep 2014 13:20:05 +0000 (07:20 -0600)]
Merged #135 "Regression in create-ticket-on-push"
James Moger [Thu, 25 Sep 2014 16:15:27 +0000 (12:15 -0400)]
Allow authentication providers to control user and team role changes
James Moger [Fri, 26 Sep 2014 13:09:41 +0000 (09:09 -0400)]
Merge branch 'ticket/135' into develop
James Moger [Fri, 26 Sep 2014 13:06:29 +0000 (09:06 -0400)]
Respect repository default integration branch for new proposal tickets
James Moger [Fri, 26 Sep 2014 12:54:52 +0000 (06:54 -0600)]
Merged #135 "Regression in create-ticket-on-push"
James Moger [Fri, 26 Sep 2014 12:44:21 +0000 (08:44 -0400)]
Merge branch 'ticket/135' into develop
James Moger [Fri, 26 Sep 2014 12:43:09 +0000 (08:43 -0400)]
Improve the error message when too many commits are pushed for a proposal
David Ostrovsky [Fri, 26 Sep 2014 08:50:37 +0000 (10:50 +0200)]
Extract authenticate method from CachingPublicKeyAuthenticator
James Moger [Thu, 25 Sep 2014 14:31:46 +0000 (08:31 -0600)]
Merged #188 "Fix failure to clear/delete ticket topic and description"
James Moger [Thu, 25 Sep 2014 14:21:08 +0000 (10:21 -0400)]
Merge branch 'ticket/188' into develop
James Moger [Thu, 25 Sep 2014 14:20:03 +0000 (10:20 -0400)]
Fix failure to clear/delete ticket topic and description
James Moger [Thu, 25 Sep 2014 13:27:04 +0000 (07:27 -0600)]
Merged #187 "Restrict Gitblit cookie to the context path"
James Moger [Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)]
Merge branch 'ticket/187' into develop
James Moger [Thu, 25 Sep 2014 13:06:39 +0000 (09:06 -0400)]
Restrict Gitblit cookie to the context path
James Moger [Thu, 25 Sep 2014 12:22:32 +0000 (06:22 -0600)]
Merged #186 "Support email subject-line links"
James Moger [Wed, 24 Sep 2014 18:20:59 +0000 (14:20 -0400)]
Support email View Ticket go-to-action
James Moger [Wed, 24 Sep 2014 17:58:27 +0000 (11:58 -0600)]
Merged #185 "Fix GITBLIT_HOME environment variable baseFolder support"
James Moger [Wed, 24 Sep 2014 17:48:08 +0000 (13:48 -0400)]
Merge branch 'ticket/185' into develop
James Moger [Wed, 24 Sep 2014 17:46:12 +0000 (13:46 -0400)]
Fix GITBLIT_HOME environment variable baseFolder support
James Moger [Wed, 17 Sep 2014 20:16:16 +0000 (14:16 -0600)]
Merged #183 "Fix bug in migrating to BranchTicketService"
James Moger [Wed, 17 Sep 2014 20:06:23 +0000 (16:06 -0400)]
Merge branch 'ticket/183' into develop
James Moger [Wed, 17 Sep 2014 20:05:42 +0000 (16:05 -0400)]
Fix bug in migrating to BranchTicketService
James Moger [Wed, 17 Sep 2014 18:38:42 +0000 (12:38 -0600)]
Merged #182 "Add NO CHANGE REQUIRED ticket status"
James Moger [Wed, 17 Sep 2014 18:23:01 +0000 (14:23 -0400)]
Merge branch 'ticket/182' into develop
James Moger [Wed, 17 Sep 2014 18:22:41 +0000 (14:22 -0400)]
Add NO CHANGE REQUIRED ticket status
James Moger [Wed, 17 Sep 2014 18:09:19 +0000 (12:09 -0600)]
Merged #181 "Sanitize ticket text at presentation time to avoid unintended html encoding"
James Moger [Wed, 17 Sep 2014 17:59:09 +0000 (13:59 -0400)]
Merge branch 'ticket/181' into develop
James Moger [Wed, 17 Sep 2014 17:58:38 +0000 (13:58 -0400)]
Sanitize ticket text at presentation time to avoid unintended html encoding
James Moger [Wed, 17 Sep 2014 16:31:35 +0000 (10:31 -0600)]
Merged #180 "Explicitly declare RepositoryPage subclasses that reference commits"
James Moger [Wed, 17 Sep 2014 16:21:47 +0000 (12:21 -0400)]
Merge branch 'ticket/180' into develop
James Moger [Wed, 17 Sep 2014 16:20:22 +0000 (12:20 -0400)]
Explicitly declare RepositoryPage subclasses that reference commits
James Moger [Wed, 17 Sep 2014 15:48:48 +0000 (09:48 -0600)]
Merged #179 "Ensure TicketModel comment text is not null in hasComment() test"
James Moger [Wed, 17 Sep 2014 15:38:50 +0000 (11:38 -0400)]
Merge branch 'ticket/179' into develop
James Moger [Wed, 17 Sep 2014 15:37:46 +0000 (11:37 -0400)]
Ensure TicketModel comment text is not null in hasComment() test
James Moger [Thu, 11 Sep 2014 15:30:39 +0000 (09:30 -0600)]
Merged #177 "Disable permission checkboxes if permission is inherited"
James Moger [Thu, 11 Sep 2014 15:21:05 +0000 (11:21 -0400)]
Merge branch 'ticket/177' into develop
James Moger [Thu, 11 Sep 2014 15:20:39 +0000 (11:20 -0400)]
Disable permission checkboxes if permission is inherited
James Moger [Thu, 11 Sep 2014 14:59:54 +0000 (08:59 -0600)]
Merged #176 "Preserve refs in commits, tree, and docs navbar links"
James Moger [Thu, 11 Sep 2014 14:49:02 +0000 (10:49 -0400)]
Merge branch 'ticket/176' into develop
James Moger [Thu, 11 Sep 2014 14:48:03 +0000 (10:48 -0400)]
Preserve refs in commits, tree, & docs navbar links
James Moger [Thu, 11 Sep 2014 13:35:45 +0000 (07:35 -0600)]
Merged #175 "Repository url is now r"
James Moger [Thu, 11 Sep 2014 13:26:16 +0000 (09:26 -0400)]
Merge branch 'ticket/175' into develop
ThanksForAllTheFish [Tue, 9 Sep 2014 12:26:56 +0000 (14:26 +0200)]
Repository url is now r
The previous 'triggerUrl' version causes a response similar to 'No git jobs using repository: http://gitblit-host/gitblit/git/repo.git'. The wroking url is 'http://gitblit-host/gitblit/r/repo.git'.
I also added brackets to improve readability
James Moger [Mon, 8 Sep 2014 22:16:12 +0000 (16:16 -0600)]
Merged #174 "Fix repository deletion bug where the Lucene ticket index was not purged"
James Moger [Mon, 8 Sep 2014 22:06:46 +0000 (18:06 -0400)]
Merge branch 'ticket/174' into develop