]> source.dussan.org Git - gitblit.git/log
gitblit.git
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

10 years agoRegister BouncyCastle as a JCE provider 94/194/1
James Moger [Tue, 30 Sep 2014 11:54:51 +0000 (07:54 -0400)]
Register BouncyCastle as a JCE provider

10 years agoSupport GITBLIT_HOME as a system property and environment variable 93/193/1
James Moger [Tue, 30 Sep 2014 11:51:31 +0000 (07:51 -0400)]
Support GITBLIT_HOME as a system property and environment variable

10 years agoMerged #192 "Tweak styling of clear cache & new repository links on repositories...
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"

10 years agoMerge branch 'ticket/192' into develop
James Moger [Mon, 29 Sep 2014 14:01:35 +0000 (10:01 -0400)]
Merge branch 'ticket/192' into develop

10 years agoTweak styling of clear cache & new repository links on repositories panel 92/192/1
James Moger [Mon, 29 Sep 2014 13:57:01 +0000 (09:57 -0400)]
Tweak styling of clear cache & new repository links on repositories panel

10 years agoMerged #190 "Extract authenticate method from CachingPublicKeyAuthenticator"
James Moger [Fri, 26 Sep 2014 15:23:17 +0000 (09:23 -0600)]
Merged #190 "Extract authenticate method from CachingPublicKeyAuthenticator"

10 years agoRenamed class to avoid confusion with FileKeyManager 90/190/1
James Moger [Fri, 26 Sep 2014 14:49:39 +0000 (10:49 -0400)]
Renamed class to avoid confusion with FileKeyManager

10 years agoMerged #191 "Allow authentication providers to control user and team role changes"
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"

10 years agoMerged #135 "Regression in create-ticket-on-push"
James Moger [Fri, 26 Sep 2014 13:20:05 +0000 (07:20 -0600)]
Merged #135 "Regression in create-ticket-on-push"

10 years agoAllow authentication providers to control user and team role changes 91/191/1
James Moger [Thu, 25 Sep 2014 16:15:27 +0000 (12:15 -0400)]
Allow authentication providers to control user and team role changes

10 years agoMerge branch 'ticket/135' into develop
James Moger [Fri, 26 Sep 2014 13:09:41 +0000 (09:09 -0400)]
Merge branch 'ticket/135' into develop

10 years agoRespect repository default integration branch for new proposal tickets 35/135/2
James Moger [Fri, 26 Sep 2014 13:06:29 +0000 (09:06 -0400)]
Respect repository default integration branch for new proposal tickets

10 years agoMerged #135 "Regression in create-ticket-on-push"
James Moger [Fri, 26 Sep 2014 12:54:52 +0000 (06:54 -0600)]
Merged #135 "Regression in create-ticket-on-push"

10 years agoMerge branch 'ticket/135' into develop
James Moger [Fri, 26 Sep 2014 12:44:21 +0000 (08:44 -0400)]
Merge branch 'ticket/135' into develop

10 years agoImprove the error message when too many commits are pushed for a proposal 35/135/1
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

10 years agoExtract authenticate method from CachingPublicKeyAuthenticator
David Ostrovsky [Fri, 26 Sep 2014 08:50:37 +0000 (10:50 +0200)]
Extract authenticate method from CachingPublicKeyAuthenticator

10 years agoMerged #188 "Fix failure to clear/delete ticket topic and description"
James Moger [Thu, 25 Sep 2014 14:31:46 +0000 (08:31 -0600)]
Merged #188 "Fix failure to clear/delete ticket topic and description"

10 years agoMerge branch 'ticket/188' into develop
James Moger [Thu, 25 Sep 2014 14:21:08 +0000 (10:21 -0400)]
Merge branch 'ticket/188' into develop

10 years agoFix failure to clear/delete ticket topic and description 88/188/1
James Moger [Thu, 25 Sep 2014 14:20:03 +0000 (10:20 -0400)]
Fix failure to clear/delete ticket topic and description

10 years agoMerged #187 "Restrict Gitblit cookie to the context path"
James Moger [Thu, 25 Sep 2014 13:27:04 +0000 (07:27 -0600)]
Merged #187 "Restrict Gitblit cookie to the context path"

10 years agoMerge branch 'ticket/187' into develop
James Moger [Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)]
Merge branch 'ticket/187' into develop

10 years agoRestrict Gitblit cookie to the context path 87/187/1
James Moger [Thu, 25 Sep 2014 13:06:39 +0000 (09:06 -0400)]
Restrict Gitblit cookie to the context path

10 years agoMerged #186 "Support email subject-line links"
James Moger [Thu, 25 Sep 2014 12:22:32 +0000 (06:22 -0600)]
Merged #186 "Support email subject-line links"

10 years agoSupport email View Ticket go-to-action 86/186/2
James Moger [Wed, 24 Sep 2014 18:20:59 +0000 (14:20 -0400)]
Support email View Ticket go-to-action

10 years agoMerged #185 "Fix GITBLIT_HOME environment variable baseFolder support"
James Moger [Wed, 24 Sep 2014 17:58:27 +0000 (11:58 -0600)]
Merged #185 "Fix GITBLIT_HOME environment variable baseFolder support"

10 years agoMerge branch 'ticket/185' into develop
James Moger [Wed, 24 Sep 2014 17:48:08 +0000 (13:48 -0400)]
Merge branch 'ticket/185' into develop

10 years agoFix GITBLIT_HOME environment variable baseFolder support 85/185/1
James Moger [Wed, 24 Sep 2014 17:46:12 +0000 (13:46 -0400)]
Fix GITBLIT_HOME environment variable baseFolder support

10 years agoMerged #183 "Fix bug in migrating to BranchTicketService"
James Moger [Wed, 17 Sep 2014 20:16:16 +0000 (14:16 -0600)]
Merged #183 "Fix bug in migrating to BranchTicketService"

10 years agoMerge branch 'ticket/183' into develop
James Moger [Wed, 17 Sep 2014 20:06:23 +0000 (16:06 -0400)]
Merge branch 'ticket/183' into develop

10 years agoFix bug in migrating to BranchTicketService 83/183/1
James Moger [Wed, 17 Sep 2014 20:05:42 +0000 (16:05 -0400)]
Fix bug in migrating to BranchTicketService

10 years agoMerged #182 "Add NO CHANGE REQUIRED ticket status"
James Moger [Wed, 17 Sep 2014 18:38:42 +0000 (12:38 -0600)]
Merged #182 "Add NO CHANGE REQUIRED ticket status"

10 years agoMerge branch 'ticket/182' into develop
James Moger [Wed, 17 Sep 2014 18:23:01 +0000 (14:23 -0400)]
Merge branch 'ticket/182' into develop

10 years agoAdd NO CHANGE REQUIRED ticket status 82/182/1
James Moger [Wed, 17 Sep 2014 18:22:41 +0000 (14:22 -0400)]
Add NO CHANGE REQUIRED ticket status

10 years agoMerged #181 "Sanitize ticket text at presentation time to avoid unintended html encoding"
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"

10 years agoMerge branch 'ticket/181' into develop
James Moger [Wed, 17 Sep 2014 17:59:09 +0000 (13:59 -0400)]
Merge branch 'ticket/181' into develop

10 years agoSanitize ticket text at presentation time to avoid unintended html encoding 81/181/1
James Moger [Wed, 17 Sep 2014 17:58:38 +0000 (13:58 -0400)]
Sanitize ticket text at presentation time to avoid unintended html encoding

10 years agoMerged #180 "Explicitly declare RepositoryPage subclasses that reference commits"
James Moger [Wed, 17 Sep 2014 16:31:35 +0000 (10:31 -0600)]
Merged #180 "Explicitly declare RepositoryPage subclasses that reference commits"

10 years agoMerge branch 'ticket/180' into develop
James Moger [Wed, 17 Sep 2014 16:21:47 +0000 (12:21 -0400)]
Merge branch 'ticket/180' into develop

10 years agoExplicitly declare RepositoryPage subclasses that reference commits 80/180/1
James Moger [Wed, 17 Sep 2014 16:20:22 +0000 (12:20 -0400)]
Explicitly declare RepositoryPage subclasses that reference commits

10 years agoMerged #179 "Ensure TicketModel comment text is not null in hasComment() test"
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"

10 years agoMerge branch 'ticket/179' into develop
James Moger [Wed, 17 Sep 2014 15:38:50 +0000 (11:38 -0400)]
Merge branch 'ticket/179' into develop

10 years agoEnsure TicketModel comment text is not null in hasComment() test 79/179/1
James Moger [Wed, 17 Sep 2014 15:37:46 +0000 (11:37 -0400)]
Ensure TicketModel comment text is not null in hasComment() test

10 years agoMerged #177 "Disable permission checkboxes if permission is inherited"
James Moger [Thu, 11 Sep 2014 15:30:39 +0000 (09:30 -0600)]
Merged #177 "Disable permission checkboxes if permission is inherited"

10 years agoMerge branch 'ticket/177' into develop
James Moger [Thu, 11 Sep 2014 15:21:05 +0000 (11:21 -0400)]
Merge branch 'ticket/177' into develop

10 years agoDisable permission checkboxes if permission is inherited 77/177/1
James Moger [Thu, 11 Sep 2014 15:20:39 +0000 (11:20 -0400)]
Disable permission checkboxes if permission is inherited

10 years agoMerged #176 "Preserve refs in commits, tree, and docs navbar links"
James Moger [Thu, 11 Sep 2014 14:59:54 +0000 (08:59 -0600)]
Merged #176 "Preserve refs in commits, tree, and docs navbar links"

10 years agoMerge branch 'ticket/176' into develop
James Moger [Thu, 11 Sep 2014 14:49:02 +0000 (10:49 -0400)]
Merge branch 'ticket/176' into develop

10 years agoPreserve refs in commits, tree, & docs navbar links 76/176/1
James Moger [Thu, 11 Sep 2014 14:48:03 +0000 (10:48 -0400)]
Preserve refs in commits, tree, & docs navbar links

10 years agoMerged #175 "Repository url is now r"
James Moger [Thu, 11 Sep 2014 13:35:45 +0000 (07:35 -0600)]
Merged #175 "Repository url is now r"

10 years agoMerge branch 'ticket/175' into develop
James Moger [Thu, 11 Sep 2014 13:26:16 +0000 (09:26 -0400)]
Merge branch 'ticket/175' into develop

10 years agoRepository url is now r 219/head 75/175/1
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

10 years agoMerged #174 "Fix repository deletion bug where the Lucene ticket index was not purged"
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"

10 years agoMerge branch 'ticket/174' into develop
James Moger [Mon, 8 Sep 2014 22:06:46 +0000 (18:06 -0400)]
Merge branch 'ticket/174' into develop

10 years agoFix repository deletion bug where the Lucene ticket index was not purged 74/174/1
James Moger [Mon, 8 Sep 2014 22:06:09 +0000 (18:06 -0400)]
Fix repository deletion bug where the Lucene ticket index was not purged

10 years agoMerged #173 "Fix MigrateTickets failure for view-restricted repositories"
James Moger [Mon, 8 Sep 2014 20:49:20 +0000 (14:49 -0600)]
Merged #173 "Fix MigrateTickets failure for view-restricted repositories"

10 years agoMerge branch 'ticket/173' into develop
James Moger [Mon, 8 Sep 2014 20:39:52 +0000 (16:39 -0400)]
Merge branch 'ticket/173' into develop

10 years agoFix MigrateTickets failure for view-restricted repositories 73/173/1
James Moger [Mon, 8 Sep 2014 20:39:02 +0000 (16:39 -0400)]
Fix MigrateTickets failure for view-restricted repositories

10 years agoMerged #172 "Fix value discarding bug in SafeTextModel"
James Moger [Mon, 8 Sep 2014 20:32:44 +0000 (14:32 -0600)]
Merged #172 "Fix value discarding bug in SafeTextModel"

10 years agoMerged #171 "Fix potential NPE in TicketListPanel due to missing repository"
James Moger [Mon, 8 Sep 2014 20:25:59 +0000 (14:25 -0600)]
Merged #171 "Fix potential NPE in TicketListPanel due to missing repository"

10 years agoMerge branch 'ticket/172' into develop
James Moger [Mon, 8 Sep 2014 20:23:27 +0000 (16:23 -0400)]
Merge branch 'ticket/172' into develop

10 years agoFix value discarding bug in SafeTextModel 72/172/1
James Moger [Mon, 8 Sep 2014 20:22:42 +0000 (16:22 -0400)]
Fix value discarding bug in SafeTextModel

10 years agoMerge branch 'ticket/171' into develop
James Moger [Mon, 8 Sep 2014 20:17:56 +0000 (16:17 -0400)]
Merge branch 'ticket/171' into develop

10 years agoFix potential NPE in TicketListPanel due to missing repository 71/171/1
James Moger [Mon, 8 Sep 2014 20:15:30 +0000 (16:15 -0400)]
Fix potential NPE in TicketListPanel due to missing repository

10 years agoMerged #170 "New ticket reponsible selections are missing users with RW access"
James Moger [Mon, 8 Sep 2014 19:34:52 +0000 (13:34 -0600)]
Merged #170 "New ticket reponsible selections are missing users with RW access"

10 years agoMerge branch 'ticket/170' into develop
James Moger [Mon, 8 Sep 2014 19:26:22 +0000 (15:26 -0400)]
Merge branch 'ticket/170' into develop

10 years agoInclude all users with RW access in New Ticket responsible choices 70/170/1
James Moger [Mon, 8 Sep 2014 19:25:47 +0000 (15:25 -0400)]
Include all users with RW access in New Ticket responsible choices

10 years agoMerged #169 "Do not display stacktraces for bad requests in servlets"
James Moger [Mon, 8 Sep 2014 18:46:51 +0000 (12:46 -0600)]
Merged #169 "Do not display stacktraces for bad requests in servlets"

10 years agoMerge branch 'ticket/169' into develop
James Moger [Mon, 8 Sep 2014 18:38:25 +0000 (14:38 -0400)]
Merge branch 'ticket/169' into develop

10 years agoImprove bad request handling in branch graph, zip, & syndication servlets 69/169/1
James Moger [Mon, 8 Sep 2014 18:37:46 +0000 (14:37 -0400)]
Improve bad request handling in branch graph, zip, & syndication servlets

10 years agoMerged #134 "LDAP user accounts will not reset/clear the email address"
James Moger [Mon, 8 Sep 2014 18:06:15 +0000 (12:06 -0600)]
Merged #134 "LDAP user accounts will not reset/clear the email address"

10 years agoMerge branch 'ticket/134' into develop
James Moger [Mon, 8 Sep 2014 17:57:53 +0000 (13:57 -0400)]
Merge branch 'ticket/134' into develop

10 years agoAllow LDAP to reset/delete an user email address value 34/134/1
James Moger [Mon, 8 Sep 2014 17:57:09 +0000 (13:57 -0400)]
Allow LDAP to reset/delete an user email address value

10 years agoMerged #161 "Allow Lucene indexing period to be configurable"
James Moger [Mon, 8 Sep 2014 17:49:52 +0000 (11:49 -0600)]
Merged #161 "Allow Lucene indexing period to be configurable"

10 years agoMerge branch 'ticket/161' into develop
James Moger [Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)]
Merge branch 'ticket/161' into develop

10 years agoExpose setting to control Lucene repository indexing frequency 61/161/1
James Moger [Mon, 8 Sep 2014 17:38:49 +0000 (13:38 -0400)]
Expose setting to control Lucene repository indexing frequency

10 years agoMerged #132 "Ticket notifications aren't sent when the author doesn't have an email...
James Moger [Mon, 8 Sep 2014 17:22:25 +0000 (11:22 -0600)]
Merged #132 "Ticket notifications aren't sent when the author doesn't have an email address"

10 years agoMerge branch 'ticket/132' into develop
James Moger [Mon, 8 Sep 2014 17:14:01 +0000 (13:14 -0400)]
Merge branch 'ticket/132' into develop

10 years agoFix ticket mail dropping bug when author does not have an address 32/132/1
James Moger [Mon, 8 Sep 2014 17:10:38 +0000 (13:10 -0400)]
Fix ticket mail dropping bug when author does not have an address

10 years agoMerged #168 "Show account type in teams panel"
James Moger [Sun, 7 Sep 2014 21:38:54 +0000 (15:38 -0600)]
Merged #168 "Show account type in teams panel"

10 years agoShow account type column in teams panel. 217/head 68/168/1
Florian Zschocke [Mon, 11 Nov 2013 21:21:36 +0000 (22:21 +0100)]
Show account type column in teams panel.

Add a new column to the team panel, showing the account type.

10 years agoMerge branch 'ticket/164' into develop
James Moger [Sun, 7 Sep 2014 16:53:08 +0000 (12:53 -0400)]
Merge branch 'ticket/164' into develop

10 years agoMerged #164 "Sanitize page parameters for XSS vulerabilities"
James Moger [Sun, 7 Sep 2014 16:04:12 +0000 (10:04 -0600)]
Merged #164 "Sanitize page parameters for XSS vulerabilities"