]> source.dussan.org Git - gitblit.git/log
gitblit.git
10 years agoMerge branch 'ticket/141' into develop
James Moger [Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)]
Merge branch 'ticket/141' into develop

10 years agoMerge branch 'ticket/140' into develop
James Moger [Thu, 4 Sep 2014 14:45:50 +0000 (10:45 -0400)]
Merge branch 'ticket/140' into develop

10 years agoAllow gitblit baseFolder to be defined by a system property 212/head 41/141/1
Koen Serry [Sun, 3 Aug 2014 08:50:14 +0000 (10:50 +0200)]
Allow gitblit baseFolder to be defined by a system property

10 years agoUpdated french translations 210/head 40/140/1
Romain GAGNAIRE [Fri, 25 Jul 2014 08:12:46 +0000 (10:12 +0200)]
Updated french translations

10 years agoMerge branch 'ticket/139' into develop
James Moger [Sat, 5 Jul 2014 17:26:48 +0000 (13:26 -0400)]
Merge branch 'ticket/139' into develop

Conflicts:
src/main/java/com/gitblit/servlet/RawServlet.java

10 years agoMerge branch 'ticket/139'
James Moger [Sat, 5 Jul 2014 17:25:26 +0000 (13:25 -0400)]
Merge branch 'ticket/139'

Conflicts:
src/main/java/com/gitblit/servlet/RawServlet.java

10 years agoFix raw servlet blob paths not respecting web.forwardSlashCharacter 39/139/2
James Moger [Sat, 5 Jul 2014 17:06:24 +0000 (13:06 -0400)]
Fix raw servlet blob paths not respecting web.forwardSlashCharacter

10 years agoMerged #139 "Raw link blob paths do not respect web.forwardSlashCharacter"
James Moger [Sat, 5 Jul 2014 17:10:40 +0000 (11:10 -0600)]
Merged #139 "Raw link blob paths do not respect web.forwardSlashCharacter"

10 years agoMerge branch 'ticket/139' into develop
James Moger [Sat, 5 Jul 2014 17:07:04 +0000 (13:07 -0400)]
Merge branch 'ticket/139' into develop

10 years agoFix raw servlet blob paths not respecting web.forwardSlashCharacter 39/139/1
James Moger [Sat, 5 Jul 2014 17:06:24 +0000 (13:06 -0400)]
Fix raw servlet blob paths not respecting web.forwardSlashCharacter

10 years agoMerged #137 "NPE in RawServlet#L265"
James Moger [Sat, 5 Jul 2014 16:32:39 +0000 (10:32 -0600)]
Merged #137 "NPE in RawServlet#L265"

10 years agoMerge branch 'ticket/137' into develop
James Moger [Sat, 5 Jul 2014 16:28:37 +0000 (12:28 -0400)]
Merge branch 'ticket/137' into develop

10 years agoFix possible NPE in RawServlet 37/137/1
James Moger [Sat, 5 Jul 2014 16:27:17 +0000 (12:27 -0400)]
Fix possible NPE in RawServlet

10 years agoMerged #80 "Replace Dagger with Guice"
James Moger [Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)]
Merged #80 "Replace Dagger with Guice"

10 years agoUpdate to Moxie 0.9.4
James Moger [Thu, 3 Jul 2014 21:52:15 +0000 (17:52 -0400)]
Update to Moxie 0.9.4

10 years agoUpdate to Guava 17 80/80/6
James Moger [Thu, 3 Jul 2014 20:19:49 +0000 (16:19 -0400)]
Update to Guava 17

10 years agoSupport injection of plugin Extensions
James Moger [Thu, 3 Jul 2014 18:30:22 +0000 (14:30 -0400)]
Support injection of plugin Extensions

10 years agoDelay setup of the repositories folder to start()
James Moger [Wed, 2 Jul 2014 21:51:35 +0000 (17:51 -0400)]
Delay setup of the repositories folder to start()

10 years agoDelay pf4j instantiation and setup to start()
James Moger [Wed, 2 Jul 2014 20:50:45 +0000 (16:50 -0400)]
Delay pf4j instantiation and setup to start()

10 years agoExtract ticket service into an injectable object with a custom provider
James Moger [Wed, 2 Jul 2014 20:45:37 +0000 (16:45 -0400)]
Extract ticket service into an injectable object with a custom provider

10 years agoImplement custom IPublicKeyManager provider
James Moger [Wed, 2 Jul 2014 20:39:47 +0000 (16:39 -0400)]
Implement custom IPublicKeyManager provider

10 years agoAnnotate managers with @Singleton
James Moger [Wed, 2 Jul 2014 20:30:55 +0000 (16:30 -0400)]
Annotate managers with @Singleton

10 years agoExtract services manager into a top-level injectable manager
James Moger [Wed, 2 Jul 2014 20:21:16 +0000 (16:21 -0400)]
Extract services manager into a top-level injectable manager

10 years agoDocumentation
James Moger [Tue, 1 Jul 2014 03:25:01 +0000 (23:25 -0400)]
Documentation

10 years agoAdjust builds for appropriate dependencies
James Moger [Tue, 1 Jul 2014 02:45:52 +0000 (22:45 -0400)]
Adjust builds for appropriate dependencies

10 years agoRemoved beans.xml
James Moger [Tue, 1 Jul 2014 02:29:48 +0000 (22:29 -0400)]
Removed beans.xml

10 years agoUse forked guice-servlet jar rather than stock jar from Google
James Moger [Tue, 1 Jul 2014 01:29:01 +0000 (21:29 -0400)]
Use forked guice-servlet jar rather than stock jar from Google

10 years agoTemporarily depend on patched guice-servlet (guice-807)
James Moger [Thu, 12 Jun 2014 23:25:12 +0000 (19:25 -0400)]
Temporarily depend on patched guice-servlet (guice-807)

10 years agoRestore all security filters
James Moger [Thu, 12 Jun 2014 23:19:26 +0000 (19:19 -0400)]
Restore all security filters

10 years agoUse Guice annotations, not javax.inject annotations
James Moger [Thu, 12 Jun 2014 22:12:46 +0000 (18:12 -0400)]
Use Guice annotations, not javax.inject annotations

10 years agoDropped WebListener annotation
James Moger [Sat, 24 May 2014 13:20:59 +0000 (09:20 -0400)]
Dropped WebListener annotation

10 years agoUse Guice-Servlet rather than custom code and expose the Injector
James Moger [Fri, 23 May 2014 12:17:11 +0000 (08:17 -0400)]
Use Guice-Servlet rather than custom code and expose the Injector

This is a fairly functional variation of Gitblit with one notable
exception:

    The security filters are not working properly.

This is a design flaw in Guice that I have reported upstream [1].  The
general idea is that Guice-Servlet filters are not properly wrapping the
ServletRequest. This has historically been a problem for Guice-Servlet
servlets but Google has fixed most of those issues.  Unfortunately, all
the same flaws reported against the servlet delegation also exist in
Guice-Servlet filter delegation. :(

[1]: https://code.google.com/p/google-guice/issues/detail?id=807

10 years agoReplace Dagger with Guice 4.0 beta and update Guava to 16.0.1
James Moger [Fri, 16 May 2014 20:16:32 +0000 (16:16 -0400)]
Replace Dagger with Guice 4.0 beta and update Guava to 16.0.1

10 years agoMerged #128 "Move apt folder from 'dagger' to 'gen'"
James Moger [Thu, 3 Jul 2014 20:21:01 +0000 (14:21 -0600)]
Merged #128 "Move apt folder from 'dagger' to 'gen'"

10 years agoMove the DaggerModule to the Dagger package
James Moger [Fri, 16 May 2014 18:52:21 +0000 (14:52 -0400)]
Move the DaggerModule to the Dagger package

10 years agoEmbrace @Inject for Managers, Servlets, and Filters
James Moger [Fri, 16 May 2014 17:50:59 +0000 (13:50 -0400)]
Embrace @Inject for Managers, Servlets, and Filters

10 years agoUpdate to Dagger 1.2.1 and Guava 15
James Moger [Fri, 16 May 2014 17:50:01 +0000 (13:50 -0400)]
Update to Dagger 1.2.1 and Guava 15

10 years agoReturn of Servlet3 servlet and filter loading
James Moger [Fri, 16 May 2014 14:34:35 +0000 (10:34 -0400)]
Return of Servlet3 servlet and filter loading

This is a quick return of the servlet3-style code which was reverted mid-December 2013. It is not completely tested, but a casual review was done and it's looks good. The next steps should be to restore `@Inject` annotations, simplify *DaggerModule* boilerplate, and run this on a JEE container with CDI - like JBoss AS 7.

10 years agoSwitch apt folder from 'dagger' to 'gen' 28/128/1
James Moger [Thu, 3 Jul 2014 20:16:54 +0000 (16:16 -0400)]
Switch apt folder from 'dagger' to 'gen'

10 years agoMerged #127 "Update to SSHD 0.11.1-atlassian-1"
James Moger [Thu, 3 Jul 2014 20:11:33 +0000 (14:11 -0600)]
Merged #127 "Update to SSHD 0.11.1-atlassian-1"

10 years agoUpdate to SSHD 0.11.1-atlassian-1 27/127/1
James Moger [Thu, 3 Jul 2014 20:07:23 +0000 (16:07 -0400)]
Update to SSHD 0.11.1-atlassian-1

10 years agoMerged #126 "Update to JGit 3.4.1"
James Moger [Thu, 3 Jul 2014 20:04:09 +0000 (14:04 -0600)]
Merged #126 "Update to JGit 3.4.1"

10 years agoMerged #125 "Update to Groovy 2.3.3"
James Moger [Thu, 3 Jul 2014 20:01:39 +0000 (14:01 -0600)]
Merged #125 "Update to Groovy 2.3.3"

10 years agoUpdate to JGit 3.4.1 26/126/1
James Moger [Thu, 3 Jul 2014 20:00:05 +0000 (16:00 -0400)]
Update to JGit 3.4.1

10 years agoMerged #122 "Update to SLF4j 1.7.7"
James Moger [Thu, 3 Jul 2014 19:57:58 +0000 (13:57 -0600)]
Merged #122 "Update to SLF4j 1.7.7"

10 years agoUpdate to Groovy 2.3.3 25/125/1
James Moger [Thu, 3 Jul 2014 19:56:34 +0000 (15:56 -0400)]
Update to Groovy 2.3.3

10 years agoUpdate to SLF4j 1.7.7 22/122/2
James Moger [Thu, 3 Jul 2014 19:53:15 +0000 (15:53 -0400)]
Update to SLF4j 1.7.7

10 years agoRefine startup ascii artwork
James Moger [Wed, 2 Jul 2014 21:06:14 +0000 (17:06 -0400)]
Refine startup ascii artwork

10 years agoMerged #124 "Update to Freemarker 2.3.20"
James Moger [Wed, 2 Jul 2014 21:45:43 +0000 (15:45 -0600)]
Merged #124 "Update to Freemarker 2.3.20"

10 years agoMerged #123 "Update to gson 2.2.2"
James Moger [Wed, 2 Jul 2014 21:43:48 +0000 (15:43 -0600)]
Merged #123 "Update to gson 2.2.2"

10 years agoUpdate to Freemarker 2.3.20 24/124/1
James Moger [Wed, 2 Jul 2014 21:41:40 +0000 (17:41 -0400)]
Update to Freemarker 2.3.20

10 years agoUpdate to gson 2.2.2 23/123/2
James Moger [Wed, 2 Jul 2014 21:37:51 +0000 (17:37 -0400)]
Update to gson 2.2.2

10 years agoMerged #122 "Update to SLF4j 1.7.7"
James Moger [Wed, 2 Jul 2014 21:39:30 +0000 (15:39 -0600)]
Merged #122 "Update to SLF4j 1.7.7"

10 years agoUpdate to SLF4j 1.7.7 22/122/1
James Moger [Wed, 2 Jul 2014 21:27:44 +0000 (17:27 -0400)]
Update to SLF4j 1.7.7

10 years agoDocumentation
James Moger [Tue, 1 Jul 2014 14:19:07 +0000 (10:19 -0400)]
Documentation

10 years agoMerged #121 "Add additional documentation for web.canonicalUrl"
James Moger [Tue, 1 Jul 2014 13:31:26 +0000 (07:31 -0600)]
Merged #121 "Add additional documentation for web.canonicalUrl"

10 years agoMerge branch 'ticket/121' into develop
James Moger [Tue, 1 Jul 2014 13:29:10 +0000 (09:29 -0400)]
Merge branch 'ticket/121' into develop

10 years agoRefine web.canonicalUrl documentation 21/121/2
Kyle Gottfried [Mon, 23 Jun 2014 19:07:50 +0000 (15:07 -0400)]
Refine web.canonicalUrl documentation

10 years agoMerged #120 "Update Korean translation"
James Moger [Tue, 1 Jul 2014 12:14:54 +0000 (06:14 -0600)]
Merged #120 "Update Korean translation"

10 years agoMerge branch 'ticket/120' into develop
James Moger [Tue, 1 Jul 2014 12:12:03 +0000 (08:12 -0400)]
Merge branch 'ticket/120' into develop

10 years agoMerged #109 "Use release name as root directory in Gitblit GO artefacts"
James Moger [Tue, 1 Jul 2014 03:06:11 +0000 (21:06 -0600)]
Merged #109 "Use release name as root directory in Gitblit GO artefacts"

10 years agoGitblit GO artefacts use release name for root directory. 09/109/2
Alex Lewis [Wed, 18 Jun 2014 11:36:07 +0000 (12:36 +0100)]
Gitblit GO artefacts use release name for root directory.

10 years agoMerged #118 "Project selections are lower-case"
James Moger [Sat, 28 Jun 2014 03:33:59 +0000 (21:33 -0600)]
Merged #118 "Project selections are lower-case"

10 years agoMerge branch 'ticket/118' into develop
James Moger [Sat, 28 Jun 2014 03:31:09 +0000 (23:31 -0400)]
Merge branch 'ticket/118' into develop

10 years agoFix project model creation bug with forced lowercase names 18/118/1
James Moger [Sat, 28 Jun 2014 03:30:04 +0000 (23:30 -0400)]
Fix project model creation bug with forced lowercase names

10 years agoMerged #117 "Duplicate repositories on dashboards"
James Moger [Sat, 28 Jun 2014 03:14:33 +0000 (21:14 -0600)]
Merged #117 "Duplicate repositories on dashboards"

10 years agoMerge branch 'ticket/117' into develop
James Moger [Sat, 28 Jun 2014 03:11:57 +0000 (23:11 -0400)]
Merge branch 'ticket/117' into develop

10 years agoUse consistent keys for repository cache lookups 17/117/1
James Moger [Sat, 28 Jun 2014 03:06:13 +0000 (23:06 -0400)]
Use consistent keys for repository cache lookups

10 years agoMerge branch 'ticket/115' into develop
James Moger [Fri, 27 Jun 2014 19:05:06 +0000 (15:05 -0400)]
Merge branch 'ticket/115' into develop

10 years agoMerged #115 "Milestone names with hypens are trouble"
James Moger [Fri, 27 Jun 2014 19:04:03 +0000 (13:04 -0600)]
Merged #115 "Milestone names with hypens are trouble"

10 years agoEscape Lucene query values with hyphens 15/115/1
James Moger [Fri, 27 Jun 2014 18:59:34 +0000 (14:59 -0400)]
Escape Lucene query values with hyphens

10 years agoMerged #113 "Internal error on entering the blob page url without specifying a path"
James Moger [Fri, 27 Jun 2014 18:40:40 +0000 (12:40 -0600)]
Merged #113 "Internal error on entering the blob page url without specifying a path"

10 years agoMerge branch 'ticket/113' into develop
James Moger [Fri, 27 Jun 2014 18:37:40 +0000 (14:37 -0400)]
Merge branch 'ticket/113' into develop

10 years agoRedirect to tree root when blob page parameters are invalid 13/113/1
James Moger [Fri, 27 Jun 2014 18:36:50 +0000 (14:36 -0400)]
Redirect to tree root when blob page parameters are invalid

10 years agoMerged #114 "StackOverFlow on (de)serialization"
James Moger [Fri, 27 Jun 2014 18:30:07 +0000 (12:30 -0600)]
Merged #114 "StackOverFlow on (de)serialization"

10 years agoMerge branch 'ticket/114' into develop
James Moger [Fri, 27 Jun 2014 18:27:46 +0000 (14:27 -0400)]
Merge branch 'ticket/114' into develop

10 years agoDo not serialize Logger ticket/114 14/114/1
James Moger [Fri, 27 Jun 2014 18:25:42 +0000 (14:25 -0400)]
Do not serialize Logger

10 years agoFix translation 206/head 20/120/1
Revi [Thu, 26 Jun 2014 07:52:30 +0000 (16:52 +0900)]
Fix translation

As well as links.

10 years agoMerged #111 "Fix api/manager download links in documentation"
James Moger [Sun, 22 Jun 2014 15:41:06 +0000 (09:41 -0600)]
Merged #111 "Fix api/manager download links in documentation"

10 years agoMerge branch 'ticket/111' into develop
James Moger [Sun, 22 Jun 2014 15:38:45 +0000 (11:38 -0400)]
Merge branch 'ticket/111' into develop

10 years agoRemoved unnecessary and obsolete download links from documenation 11/111/1
James Moger [Sun, 22 Jun 2014 15:37:27 +0000 (11:37 -0400)]
Removed unnecessary and obsolete download links from documenation

10 years agoMerged #108 "Fix NPE when there are two repositories which only differ in case"
James Moger [Wed, 18 Jun 2014 14:40:09 +0000 (08:40 -0600)]
Merged #108 "Fix NPE when there are two repositories which only differ in case"

10 years agoMerge branch 'ticket/108' into develop
James Moger [Wed, 18 Jun 2014 14:38:22 +0000 (10:38 -0400)]
Merge branch 'ticket/108' into develop

10 years agoFix NPE when there are two repositories which only differ in case 204/head 08/108/1
Sascha Vogt [Wed, 18 Jun 2014 12:07:55 +0000 (14:07 +0200)]
Fix NPE when there are two repositories which only differ in case

10 years agoMerge branch 'fix-mxwebxml'
James Moger [Tue, 17 Jun 2014 14:57:16 +0000 (10:57 -0400)]
Merge branch 'fix-mxwebxml'

10 years agoMerge branch 'fix-mxwebxml'
James Moger [Tue, 17 Jun 2014 14:55:14 +0000 (10:55 -0400)]
Merge branch 'fix-mxwebxml'

10 years agoFix WAR web.xml generation regression
James Moger [Tue, 17 Jun 2014 14:54:22 +0000 (10:54 -0400)]
Fix WAR web.xml generation regression

10 years agoDocumentation
James Moger [Tue, 17 Jun 2014 13:49:58 +0000 (09:49 -0400)]
Documentation

10 years agoMerge branch 'pr-201' into develop
James Moger [Tue, 17 Jun 2014 13:44:18 +0000 (09:44 -0400)]
Merge branch 'pr-201' into develop

10 years agoMerge pull request #202 from davido/patch-6
James Moger [Tue, 17 Jun 2014 13:11:19 +0000 (09:11 -0400)]
Merge pull request #202 from davido/patch-6

Update Jetty version to 9.2.1.v20140609

10 years agoMerge pull request #200 from davido/patch-4
James Moger [Tue, 17 Jun 2014 13:10:37 +0000 (09:10 -0400)]
Merge pull request #200 from davido/patch-4

Update JGit version to 3.4.0.201406110918-r

10 years agoUpdate Jetty version to 9.2.1.v20140609 202/head
David Ostrovsky [Tue, 17 Jun 2014 12:44:08 +0000 (14:44 +0200)]
Update Jetty version to 9.2.1.v20140609

The Jetty 9.2 quick start mechanism provides almost an order of
magnitude improvement in start time [1].

[1] https://webtide.com/jetty-9-quick-start/

10 years agoUpdate Lucene version to 4.8.1 201/head
David Ostrovsky [Tue, 17 Jun 2014 12:41:17 +0000 (14:41 +0200)]
Update Lucene version to 4.8.1

10 years agoUpdate JGit version to 3.4.0.201406110918-r 200/head
David Ostrovsky [Tue, 17 Jun 2014 12:36:53 +0000 (14:36 +0200)]
Update JGit version to 3.4.0.201406110918-r

10 years agoMerge non-fast-forward for release branch merges
James Moger [Mon, 16 Jun 2014 22:59:24 +0000 (18:59 -0400)]
Merge non-fast-forward for release branch merges

10 years agoMerge non-fast-forward for release branch merges
James Moger [Mon, 16 Jun 2014 22:59:24 +0000 (18:59 -0400)]
Merge non-fast-forward for release branch merges

10 years agoReset build identifiers for next minor release cycle
James Moger [Mon, 16 Jun 2014 22:54:27 +0000 (18:54 -0400)]
Reset build identifiers for next minor release cycle

10 years agoMerge release 1.6.0
James Moger [Mon, 16 Jun 2014 22:52:47 +0000 (18:52 -0400)]
Merge release 1.6.0

10 years agoReset build identifiers for next point release cycle
James Moger [Mon, 16 Jun 2014 21:50:38 +0000 (17:50 -0400)]
Reset build identifiers for next point release cycle

10 years agoMerge release 1.6.0
James Moger [Mon, 16 Jun 2014 21:36:12 +0000 (17:36 -0400)]
Merge release 1.6.0