From: James Moger <james.moger@gitblit.com>
Date: Fri, 7 Oct 2011 01:03:52 +0000 (-0400)
Subject: Merge branch 'master' into rpc
X-Git-Tag: v0.7.0~90
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3;p=gitblit.git

Merge branch 'master' into rpc
---

cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3
diff --cc docs/00_index.mkd
index 489f84a1,17ca428e..079bc3d3
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@@ -27,16 -26,11 +27,17 @@@ Gitblit requires a Java 6 Runtime Envir
  
  ### Current Release
  
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
  
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit
  <br/>**New:** *web.loginMessage = gitblit*
 +- added: authenticated JSON RPC mechanism 
 +<br/>**New:** *web.enableRpcServlet = true*
 +<br/>**New:** *web.enableRpcAdministration = false*
 +- added: reusable JSON RPC client class
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.
 +- fixed/broke: federation protocol.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  This breaks 0.6.0 federation clients/servers.
+ - fixed: Set the RSS content type for Firefox 4 (issue 22)
  - fixed: Null pointer exception if did not set federation strategy (issue 20)
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later
  - added: IUserService.setup(IStoredSettings) for custom user service implementations
@@@ -51,4 -45,4 +52,4 @@@ Gitblit is distributed under the terms 
  [git]: http://git-scm.com "Official Git Site"
  [gitbltsrc]: http://github.com/gitblit "gitblit git repository"
  [googlecode]: http://code.google.com/p/gitblit "gitblit project management"
--[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"
++[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"
diff --cc docs/04_releases.mkd
index 43168dd2,01b531d6..10ef2bb9
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@@ -1,16 -1,11 +1,17 @@@
  ## Release History
  
  ### Current Release
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
  
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit
  <br/>**New:** *web.loginMessage = gitblit*
 -- fixed: Set the RSS content type for Firefox 4 (issue 22)
 +- added: authenticated JSON RPC mechanism 
 +<br/>**New:** *web.enableRpcServlet = true*
 +<br/>**New:** *web.enableRpcAdministration = false*
 +- added: reusable JSON RPC client class
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.
 +- fixed/broke: federation protocol.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  This breaks 0.6.0 federation clients/servers.
++- fixed: Set the RSS content type for Firefox 4 (issue 22)
  - fixed: Null pointer exception if did not set federation strategy (issue 20)
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later
  - added: IUserService.setup(IStoredSettings) for custom user service implementations
@@@ -60,4 -55,4 +61,4 @@@
  
  - initial release
  
--[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
++[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"