From db71db17c90fd93bcf38cdf87e16a371c39708e0 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Thu, 13 Sep 2012 18:13:48 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit

---
 docs/01_features.mkd |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 4172f4e..2baacf2 100644
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -11,11 +11,20 @@
 - RSS/JSON RPC interface
 - Java/Swing Gitblit Manager tool 
 - Gitweb inspired web UI
+- Responsive web UI that subtracts elements to be usable on phones, tablets, and desktop browsers
+- Groovy pre- and post- push hook scripts, per-repository or globally for all repositories
+- Email push notifications *(via sendmail.groovy push script)*
+- Lucene indexing of specified repository branches
 - Administrators may create, edit, rename, or delete repositories through the web UI or RPC interface
 - Administrators may create, edit, rename, or delete users through the web UI or RPC interface
 - Administrators may create, edit, rename, or delete teams through the web UI or RPC interface
 - Repository Owners may edit repositories through the web UI
+- Administrators and Repository Owners may set the default branch through the web UI or RPC interface
+- LDAP authentication and optional LDAP-controlled Team memberships
+- Gravatar integration
 - Git-notes display support
+- Submodule support
+- gh-pages display support (Jekyll is not supported)
 - Branch metrics (uses Google Charts)
 - HEAD and Branch RSS feeds
 - Blame annotations view
@@ -30,6 +39,12 @@
 - Optional utility pages
     - ![docs](book_16x16.png) Docs page which enumerates all Markdown files within a repository
     - ![tickets](bug_16x16.png) Ticgit ticket pages *(based on last MIT release bf57b032 2009-01-27)*
+- Translations
+    - English
+    - Japanese
+    - Spanish
+    - Polish
+    - Korean
 
 ## Gitblit GO Features
 - Out-of-the-box integrated stack requiring minimal configuration
@@ -37,17 +52,17 @@
     (includes script to generate a self-signed certificate for *your hostname*, see [setup](/setup.html) for details)
 - Single text file for configuring server and gitblit
 - A Windows service installation script and configuration tool
+- Built-in AJP connector for Apache httpd 
 
 ## Limitations
 - HTTP/HTTPS are the only supported Git protocols
-- Access controls are not path-based, they are repository-based
+- Built-in access controls are not path-based, they are repository-based.  
 - Only Administrators can create, rename or delete repositories
 - Only Administrators can create, modify or delete users
-- Commit hooks are not supported
+- Only Administrators can create, modify or delete teams
 - Native Git may be needed to periodically run git-gc as [JGit][jgit] does not fully support the git-gc featureset.
 
 ### Caveats
-- Gitblit may eat your data.  Use at your own risk.
 - Gitblit may have security holes.  Patches welcome.  :)
 
-[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
\ No newline at end of file
+[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

--
Gitblit v1.9.1