summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update to SSHD 1.0.0James Moger2015-09-1815-59/+205
|
* Update to BouncyCastle 1.52James Moger2015-09-183-13/+13
|
* Update to Groovy 2.4.4James Moger2015-09-183-5/+5
|
* Update to Wicket 1.4.22James Moger2015-09-183-13/+13
|
* Update to SLF4J 1.7.12James Moger2015-09-183-9/+9
|
* Update to Pegdown 1.5.0James Moger2015-09-184-30/+31
|
* Revert "Merge pull request #915 from lucamilanesio/lucene-5.2.1"James Moger2015-09-185-79/+55
| | | | | This reverts commit 55c385e96e6594ec1ac3b5cd41ccd2df6048b696, reversing changes made to 61bb29d492ca9c34471ec0a119d1445ccde086e9.
* Merge pull request #915 from lucamilanesio/lucene-5.2.1James Moger2015-09-155-55/+79
|\ | | | | Bump to Lucene 5.2.1
| * Bump to Lucene 5.2.1Luca Milanesio2015-09-095-55/+79
|/
* Update IDE files and gitignoreJames Moger2015-09-013-10/+9
|
* Fix #909: Add missing SLFJ dependencies in Manager buildJames Moger2015-09-011-3/+3
|
* Removed GoogleCode reference from READMEJames Moger2015-08-121-1/+0
|
* Merge pull request #296 from Enrico204/developJames Moger2015-08-103-1/+22
|\ | | | | Added better logging for fail2ban
| * Added better logging for fail2banEnrico2042015-08-103-1/+22
| |
* | Add traditional Chinese language choiceJames Moger2015-08-071-1/+2
| |
* | Merge pull request #294 from willyann/developJames Moger2015-08-073-0/+772
|\ \ | |/ |/| Add traditional Chinese translation
| * minor translationwilliam2015-08-051-702/+702
| |
| * trandition chinese translationwilliam2015-08-053-0/+772
|/ | | | it's for zh_TW(Taiwan)
* Merge pull request #283 from mrjoel/mrjoel-fixuserfeedlinkJames Moger2015-07-301-1/+2
|\ | | | | fix feed link from user's repository page
| * fix feed link from user's repository pageJoel Johnson2015-07-141-1/+2
| |
* | Merge pull request #291 from plamentotev/patch-1James Moger2015-07-301-1/+1
|\ \ | |/ |/| Fix tags not properly indexed in Lucene
| * Fix tags not properly indexed in LucenePlamen Totev2015-07-121-1/+1
|/ | | | | All tags that reference to particular object are stored in a list within a map. There is a if statement that inits empty list when there are not references to the current object yet, but the boolean expression checks for the wrong value.
* Merge pull request #287 from mrjoel/mrjoel-sortprojectlistJames Moger2015-07-081-0/+2
|\ | | | | sort projects displayed on projects page
| * sort projects displayed on projects pageJoel Johnson2015-07-021-0/+2
| |
* | Merge pull request #284 from mrjoel/mrjoel-useshortrefsJames Moger2015-07-042-18/+14
|\ \ | | | | | | prefer shortened refs for cleaner/shorter URLs
| * | prefer shortened refs for cleaner/shorter URLsJoel Johnson2015-07-012-18/+14
| |/
* | Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurlJames Moger2015-07-045-30/+63
|\ \ | | | | | | allow internal privilege evaluation external URLs
| * | allow advertising gitblit privileges for external URLsJoel Johnson2015-07-015-30/+63
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support for hiding internal URLs, but didn't consider that it broke the evaluation of permissions (used for tickets, etc.), and caused a NPE on repoUrl.permission when trying to view the TicketPage. With all internal mechanisms disabled, it would result in the first URL being external with unknown permissions. This adds an option to use internal permissions even for external URLs. Note that this does not grant any additional permissions, but does offer the option to have gitblit advertise the full set of what is allowed, even if the external URL imposes additional restrictions.
* | Merge pull request #286 from mrjoel/mrjoel-projectlistcssJames Moger2015-07-042-2/+6
|\ \ | | | | | | provide spacing on the projects page listing
| * | provide spacing on the projects page listingJoel Johnson2015-07-022-2/+6
| |/ | | | | | | | | | | | | | | | | | | The projects page was showing the project listing directly under the navbar with no spacing. This adds spacing to have the elements offset. The table is showing using the common "repositories" class, however it can't be changed directly since several other table displays use the same class, and have adequate top margin spacing. We create a new class for the one-off use on the projects page.
* | Merge pull request #289 from mrjoel/mrjoel-typosJames Moger2015-07-041-1/+1
|\ \ | |/ |/| fix comment typo
| * fix comment typoJoel Johnson2015-07-011-1/+1
|/
* Merge pull request #282 from mrjoel/mrjoel-fixhttpurlpermsJames Moger2015-06-301-2/+3
|\ | | | | fix permission capping for HTTP/HTTPS
| * fix permission capping for HTTP/HTTPSJoel Johnson2015-06-301-2/+3
| | | | | | | | | | | | Previously used request scheme, but request scheme is unrelated to the URL being generated. Instead, base the permission capping on the scheme of the URL itself.
* | Merge pull request #278 from mrjoel/mrjoel-addversiontojarfilenameJames Moger2015-06-301-1/+1
|\ \ | | | | | | Add version number to WAR jar filename
| * | add version number to built jar filesJoel Johnson2015-06-291-1/+1
| |/
* | Merge pull request #277 from mrjoel/mrjoel-serverNPEfixJames Moger2015-06-301-16/+19
|\ \ | | | | | | NPE server fix
| * | if failed to bind to port, don't use socketJoel Johnson2015-06-291-16/+19
| |/
* | Merge pull request #276 from mrjoel/mrjoel-typofixesJames Moger2015-06-302-2/+2
|\ \ | | | | | | typo fixes
| * | typo: instantiate log messageJoel Johnson2015-06-291-1/+1
| | |
| * | typo: site ticket documentationJoel Johnson2015-06-291-1/+1
| |/
* | Merge pull request #275 from mrjoel/mrjoel-cookiesession3.0James Moger2015-06-301-2/+5
|\ \ | |/ |/| use JEE 3.0 to allow cookie session tracking
| * use JEE 3.0 to allow cookie session trackingJoel Johnson2015-06-291-2/+5
|/
* Update to JGit 4.0.1James Moger2015-06-281-1/+1
|
* Merged #259 "Allow custom host & port specification for advertised SSH urls"James Moger2015-06-155-20/+57
|\
| * Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)James Moger2015-06-155-19/+19
| |
| * Added git.sshDisplay{Port|Host} to hide port forward.Morten Bøgeskov2015-06-155-12/+49
|/ | | | | | Running gitblit in a container it's easy to expose the ssh on the default port. Using git.sshDisplayPort/git.sshDisplayHost you can expose the forwarded address as the official location.
* Merged #258 "Create an avatar provider that defaults to Gravatar"James Moger2015-06-1523-40/+247
|\
| * Revised AvatarGenerator to be injectableJames Moger2015-06-1511-108/+142
| |
| * First draft for a customized avatar imageFabrice Bacchella2015-06-1521-40/+213
| |