From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit

---
 docs/01_features.mkd |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 8adf4cf..e1c0afa 100644
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -1,16 +1,26 @@
 ## Standard Features (GO/WAR)
 - JGit SmartHTTP servlet
 - Browser and git client authentication
-- Four *per-repository* access control configurations with a Read-Only control flag
+- Four *per-repository* access restriction configurations with a Read-Only control flag
     - ![anonymous](blank.png) *Anonymous View, Clone & Push*
     - ![push](lock_go_16x16.png) *Authenticated Push*
     - ![clone](lock_pull_16x16.png) *Authenticated Clone & Push*
     - ![view](shield_16x16.png) *Authenticated View, Clone & Push*
     - ![freeze](cold_16x16.png) Freeze repository (i.e. deny push, make read-only)
+- Six *per-user/team* repository access permissions
+    - **V** (view in web ui, RSS feeds, download zip)
+    - **R** (clone)
+    - **RW** (clone and push)
+    - **RWC** (clone and push with ref creation)
+    - **RWD** (clone and push with ref creation, deletion)
+    - **RW+** (clone and push with ref creation, deletion, rewind)
+- Optional feature to allow users to create personal repositories
+- Optional feature to fork a repository to a personal repository
 - Ability to federate with one or more other Gitblit instances
 - 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
@@ -19,8 +29,10 @@
 - 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
@@ -35,7 +47,13 @@
 - Single text file for users configuration
 - 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)*
+    - ![tickets](bug_16x16.png) **readonly** 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
@@ -56,4 +74,4 @@
 ### Caveats
 - 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