From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 docs/00_index.mkd |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 5cf8173..079bc3d 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -17,6 +17,7 @@
 
 ### Tools
 <ul class='noBullets'>
+<li>*Gitblit RPC Client* - a Java Swing tool to clone repositories and remotely administer a Gitblit server
 <li>*Gitblit Federation Client* - a command line tool to clone/pull groups of repositories and optionally users and settings
 </ul>
 
@@ -26,23 +27,20 @@
 
 ### 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%*
 
-- added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances.  This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.
-<br/>**New:** *federation.name =*
-<br/>**New:** *federation.passphrase =*
-<br/>**New:** *federation.allowProposals = false*
-<br/>**New:** *federation.proposalsFolder = proposals*
-<br/>**New:** *federation.defaultFrequency = 60 mins*
-<br/>**New:** *federation.sets =*
-<br/>**New:** *mail.* settings for sending emails
-<br/>**New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance
-- added: google-gson dependency
-- added: javamail dependency
-- updated: MarkdownPapers 1.1.1
-- updated: Wicket 1.4.18
-- updated: JGit 1.1.0
-- fixed: syndication urls for WAR builds
+- 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
 
 issues, binaries, and sources @ [Google Code][googlecode]<br/>
 sources @ [Github][gitbltsrc]
@@ -54,4 +52,4 @@
 [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"
\ No newline at end of file
+[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"

--
Gitblit v1.9.1