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/04_design.mkd | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/docs/04_design.mkd b/docs/04_design.mkd index e16a9b1..ce83f4d 100644 --- a/docs/04_design.mkd +++ b/docs/04_design.mkd @@ -1,7 +1,7 @@ ## Design Principles 1. [Keep It Simple, Stupid](http://en.wikipedia.org/wiki/KISS_principle) 2. Offer useful features for serving Git repositories. If feature is complex, refer to #1. -3. All dependencies must be retrievable from a publicly accessible [Maven](http://maven.apache.org) repository.<br/>This is to ensure authenticity of dependencies, to keep the Gitblit GO distribution svelte, and to automate the setup of developer environments. +3. All dependencies must be retrievable from a publicly accessible [Maven](http://maven.apache.org) repository.<br/>This is to ensure authenticity of dependencies and to automate the setup of developer environments. ## Architecture @@ -11,10 +11,12 @@ The following dependencies are bundled with Gitblit. - [Bootstrap](http://twitter.github.com/bootstrap) (Apache 2.0) +- [GLYPHICONS](http://glyphicons.com) (Creative Commons CC-BY) - [Clippy](https://github.com/mojombo/clippy) (MIT) - [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0) - [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0) - magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY) +- Git logo originally designed by [Jason Long](http://git-scm.com/downloads/logos) - modified Git logo originally designed by [Henrik Nyh](http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon) - other icons courtesy of [FatCow Hosting](http://www.fatcow.com/free-icons) (Creative Commons CC-BY) @@ -36,6 +38,9 @@ - [google-gson](http://code.google.com/google-gson) (Apache 2.0) - [javamail](http://kenai.com/projects/javamail) (CDDL-1.0, BSD, GPL-2.0, GNU-Classpath) - [Groovy](http://groovy.codehaus.org) (Apache 2.0) +- [Lucene](http://lucene.apache.org) (Apache 2.0) +- [UnboundID](http://www.unboundid.com) (LGPL 2.1) +- [Ivy](http://ant.apache.org/ivy) (Apache 2.0) ### Other Build Dependencies - [Fancybox image viewer](http://fancybox.net) (MIT and GPL dual-licensed) -- Gitblit v1.9.1