summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge release 1.6.2James Moger2014-10-284-6/+12
|\
| * Prepare 1.6.2 releasev1.6.2James Moger2014-10-282-10/+10
| |
| * DocumentationJames Moger2014-10-272-3/+7
| |
| * Fix PluginManager not properly respecting --noverifyJames Moger2014-10-272-0/+6
| |
| * Merged #211 "Fix raw servlet trashing paths with spaces"James Moger2014-10-262-3/+4
| |\
* | \ Merged #110 "Support multiple/chained config files"James Moger2014-10-2711-1904/+2034
|\ \ \
| * | | Adopt chain-loading properties as the default setupJames Moger2014-10-2711-1913/+1988
| | | |
| * | | Supported include keys in gitblit.propertiesJames Moger2014-10-261-0/+55
| | | | | | | | | | | | | | | | | | | | This allows you to build a hierarchy of properties files or for a properties file to include default settings.
* | | | Merge branch 'ticket/211' into developJames Moger2014-10-262-7/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix raw servlet trashing paths with spacesJames Moger2014-10-262-3/+4
| |/
| * DocumentationJames Moger2014-10-221-2/+4
| |
| * Merged #210 "Use unicode in french translation"James Moger2014-10-221-338/+338
| |\
* | \ Merged #209 "Plugin manager does not completely respect --noverify"James Moger2014-10-231-1/+5
|\ \ \
| * | | Fix broken implementation of --noverify for installing a plugin from a urlJames Moger2014-10-231-1/+5
|/ / /
* | | DocumentationJames Moger2014-10-231-1/+2
| | |
* | | Small adjustment to FilterableRepositoryList css classesJames Moger2014-10-231-5/+5
| | |
* | | Merged #106 "Consider integrating GitHub Octicons"James Moger2014-10-2318-88/+1075
|\ \ \
| * | | Integrate GitHub OcticonsJames Moger2014-10-2318-88/+1075
|/ / /
* | | Merge branch 'ticket/210' into developJames Moger2014-10-222-339/+339
|\ \ \ | | |/ | |/|
| * | Use unicode in french translationptemplier2014-10-221-338/+338
| |/ | | | | translated using native2ascii
| * Reset build identifiers for next point release cycleJames Moger2014-10-202-2/+20
| |
| * Merge release 1.6.1James Moger2014-10-205-21/+129
| |\
* | | Fix critical severity dot positioningJames Moger2014-10-211-1/+1
| | |
* | | DocumentationJames Moger2014-10-211-1/+2
| | |
* | | Merged #157 "Add Priority & Severity fields to the ticket model"James Moger2014-10-2120-21/+547
|\ \ \
| * | | Remove S# text, set severity in tooltipJames Moger2014-10-213-21/+24
| | | |
| * | | Adjust priority & severity CSSJames Moger2014-10-211-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Severity: more severe are ROY, less severe are GB - Replaced first-letter of severity with S# and show # dots - Priority: higher priorityare RO, lower priority is B I really like the 'C, 'CA' idea but that will definitely lead to translation questions. The S# approach will still generate the same complaints, but at least it is more generic.
| * | | Tickets - Priority, Severity optionsPaul Martin2014-10-2020-18/+536
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | + Severity indicated via new character indicator and color of ticket icon on ticket list + Priority indicated via new priority icon and color on ticket list + Indexed as integers to provide sorting and maintain language neutral index + Colours and indicator text controlled through CSS classes priority-<x> & severity-<x> + UITicketTest created to generate tickets of all types to ease debugging
* | | Merge release-1.6.1James Moger2014-10-205-25/+144
|\ \ \ | | |/ | |/|
| * | Prepare 1.6.1 releasev1.6.1James Moger2014-10-202-10/+10
| | |
| * | Correct unit test assertionJames Moger2014-10-201-1/+1
| | |
| * | Documentation updatesJames Moger2014-10-201-0/+2
| | |
| * | Prepare v1.6.1 documentation updatesJames Moger2014-10-203-10/+116
| |/
| * Merged #205 "Update to JGit 3.5.1"James Moger2014-10-143-9/+9
| |\
* | \ Merged #206 "New Ticket Type - Maintenance"James Moger2014-10-197-21/+47
|\ \ \
| * | | New Ticket Type - MaintenancePaul Martin2014-10-197-21/+47
|/ / / | | | | | | | | | | | | | | | | | | + Indended for identifiying and loggin maintenance of development tools and systems to provide an integrated means to satisfy ISO requirements + Improved alignment of query icons via fixed width attribute
* | | Merge branch 'ticket/205' into developJames Moger2014-10-143-9/+9
|\ \ \ | | |/ | |/|
| * | Update to JGit 3.5.1James Moger2014-10-143-9/+9
| |/
| * Fix potential NPE when excluding last change authorJames Moger2014-10-131-1/+1
| |
| * Fix GitBlitTest.testGitblitSettings()James Moger2014-10-131-1/+5
| |
| * Fix backslash regression in relative path determiniationJames Moger2014-10-131-1/+1
| |
| * Merged #204 "Improve relative path determination using Java 7 Paths"James Moger2014-10-101-14/+6
| |\
* | | Fix GitBlitTest.testGitblitSettings()James Moger2014-10-131-1/+5
| | |
* | | Fix backslash regression in relative path determiniationJames Moger2014-10-131-1/+1
| | |
* | | Merge branch 'ticket/204' into developJames Moger2014-10-101-14/+6
|\ \ \ | | |/ | |/|
| * | Improve relative path determination using Java 7 PathsJames Moger2014-10-101-14/+6
| |/
| * Merged #203 "Bug in the rawservlet in extracting the repository out of the path"James Moger2014-10-071-1/+1
| |\
* | \ Merge branch 'ticket/203' into developJames Moger2014-10-071-1/+1
|\ \ \ | | |/ | |/|
| * | Bug in the rawservlet in extracting the repository out of the path. TheRobbert Noordzij2014-10-071-1/+1
| |/ | | | | | | | | offset for finding the next slash should be the current slash + 1, not the last offset + the offset of the current slash.
| * Merged #202 "Treat .ico and .jpeg files as images"James Moger2014-10-063-3/+3
| |\