summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--HOME.md7
-rw-r--r--src/site/features.mkd5
-rw-r--r--src/site/roadmap.mkd2
3 files changed, 11 insertions, 3 deletions
diff --git a/HOME.md b/HOME.md
index 98c45ebf..7b722b2d 100644
--- a/HOME.md
+++ b/HOME.md
@@ -38,6 +38,13 @@ This documentation is the source content from which the [Gitblit website](http:/
[[src/site/administration.mkd]]
[[src/site/setup_scaling.mkd]]
+### Gitblit Tickets
+
+[[src/site/tickets_overview.mkd]]
+[[src/site/tickets_using.mkd]]
+[[src/site/tickets_barnum.mkd]]
+[[src/site/tickets_setup.mkd]]
+
### Other Pages
[[src/site/federation.mkd]]
diff --git a/src/site/features.mkd b/src/site/features.mkd
index c426abf1..0f4e7f89 100644
--- a/src/site/features.mkd
+++ b/src/site/features.mkd
@@ -20,6 +20,7 @@
- Optional feature to fork a repository to a personal repository
- Optional feature to create a repository on push
- Optional feature to automatically fetch ref updates for repository mirrors
+- Optional Issue Tracker and Pull-Request-like mechanism
- *Experimental* built-in Garbage Collection
- Ability to federate with one or more other Gitblit instances
- RSS/JSON RPC interface
@@ -52,7 +53,7 @@
- Display of Author and Committer email addresses can be disabled
- Case-insensitive searching of commit messages, authors, or committers
- Dynamic zip downloads feature
-- Markdown file view support
+- Markdown, Confluence, Textile, Twiki, Tracwiki, & Mediawiki markup rendering support
- Syntax highlighting for popular source code types
- Customizable regular expression substitution for commit messages (i.e. bug or code review link integration)
- Single text file for users configuration
@@ -77,7 +78,7 @@
- Built-in AJP connector for Apache httpd
## Limitations
-- HTTP/HTTPS/GIT are the only supported Git protocols
+- HTTP/HTTPS/GIT are the only supported Git protocols (SSH is in progress)
- Built-in access controls are not path-based, they are repository-based.
[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
diff --git a/src/site/roadmap.mkd b/src/site/roadmap.mkd
index 485885ea..03d69dfb 100644
--- a/src/site/roadmap.mkd
+++ b/src/site/roadmap.mkd
@@ -3,7 +3,7 @@
This is not exactly a formal roadmap but it is a priority list of what might be implemented in future releases.
This list is volatile and may not reflect what will be in the next release.
-* **In-Progress**: Integrate an SSH daemon to complete the transport trifecta: http/https, git, and ssh (issue-369)
+* **In-Progress**: Integrate an SSH daemon (issue-369)
* Diff should highlight inserted/removed fragment compared to original line
* Respect Gerrit branch permissions, if found (issue 36)