Gitblit devel
parent: e2013b | patch | commitdiff
mschaefers
2012-12-03 ba6ae959b8e21c714c69f66254e82837d45a3ed2
refs
author mschaefers <mschaefers@scoop-gmbh.de>
Monday, December 3, 2012 03:49 -0500
committer mschaefers <mschaefers@scoop-gmbh.de>
Monday, December 3, 2012 03:49 -0500
commitba6ae959b8e21c714c69f66254e82837d45a3ed2
tree 3f538ad138d47b43d8f6a00e0f3c18c147bfcb90 tree | zip | gz
parent e2013b91626a4c693053e9859add68ff371f2298 view | diff
f1c3a882d12aede461e3c8ca3ebd298bdb28bc5d view | diff 
Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

Conflicts:
	distrib/gitblit.properties
4 files added
29 files modified
1020 ■■■■■ changed files
.classpath 2 ●●●●● diff | view | raw | blame | history
NOTICE 18 ●●●●● diff | view | raw | blame | history
build.xml 7 ●●●●● diff | view | raw | blame | history
distrib/gitblit.properties 105 ●●●●● diff | view | raw | blame | history
docs/04_design.mkd 2 ●●●●● diff | view | raw | blame | history
docs/04_releases.mkd 6 ●●●●● diff | view | raw | blame | history
resources/gitblit.css 6 ●●●●● diff | view | raw | blame | history
resources/script_16x16.png diff | view | raw | blame | history
src/com/gitblit/Constants.java 10 ●●●●● diff | view | raw | blame | history
src/com/gitblit/DownloadZipServlet.java 58 ●●●●● diff | view | raw | blame | history
src/com/gitblit/GitBlit.java 50 ●●●●● diff | view | raw | blame | history
src/com/gitblit/authority/GitblitAuthority.java 21 ●●●●● diff | view | raw | blame | history
src/com/gitblit/build/Build.java 20 ●●●●● diff | view | raw | blame | history
src/com/gitblit/utils/CompressionUtils.java 315 ●●●●● diff | view | raw | blame | history
src/com/gitblit/utils/HttpUtils.java 42 ●●●●● diff | view | raw | blame | history
src/com/gitblit/utils/JGitUtils.java 73 ●●●●● diff | view | raw | blame | history
src/com/gitblit/utils/X509Utils.java 68 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/GitBlitWebSession.java 4 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/BasePage.java 38 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/CommitPage.html 2 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/CommitPage.java 10 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/RepositoryPage.java 2 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/TreePage.html 6 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/pages/TreePage.java 23 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/BranchesPanel.java 21 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/CompressedDownloadsPanel.html 12 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/CompressedDownloadsPanel.java 77 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/HistoryPanel.html 2 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/HistoryPanel.java 2 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/LogPanel.html 2 ●●●●● diff | view | raw | blame | history
src/com/gitblit/wicket/panels/LogPanel.java 2 ●●●●● diff | view | raw | blame | history
tests/com/gitblit/tests/JGitUtilsTest.java 7 ●●●●● diff | view | raw | blame | history
tests/com/gitblit/tests/X509UtilsTest.java 7 ●●●●● diff | view | raw | blame | history