summaryrefslogtreecommitdiffstats
path: root/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Add merge type setting to repository page.ticket/104Florian Zschocke2014-09-073-2/+11
* Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2014-09-076-96/+349
* Merge branch 'ticket/164' into developJames Moger2014-09-0724-670/+1034
|\
| * Apply the relaxed XSS filter to Markdown commit messagesJames Moger2014-09-071-1/+2
| * Enforce relaxed XSS filtering on markup documentsJames Moger2014-09-076-463/+480
| * Implement a SafeTextModel and use that for fields vulnerable to XSSJames Moger2014-09-075-11/+112
| * XSS sanitize standard page url parametersJames Moger2014-09-072-189/+221
| * Create infrastructure for XSS sanitizationJames Moger2014-09-0711-8/+219
* | Merge branch 'ticket/167' into developJames Moger2014-09-051-0/+7
|\|
| * New forks shall respect the source repository access restrictionJames Moger2014-09-051-0/+7
* | Merge branch 'ticket/166' into developJames Moger2014-09-051-0/+3
|\|
| * Specify response header X-Frame-Options SAMEORIGIN for generated pagesJames Moger2014-09-051-0/+3
* | Merge branch 'ticket/165' into developJames Moger2014-09-052-2/+2
|\|
| * Change Clippy's script access attributeJames Moger2014-09-052-2/+2
* | Merge branch 'ticket/163' into developJames Moger2014-09-051-4/+1
|\|
| * Fix NPE in raw servlet for long project namesJames Moger2014-09-051-4/+1
* | Allow Plugins to have injected members and Extensions to be constructedJames Moger2014-09-041-26/+51
* | Bump the index version and update the LuceneVersionJames Moger2014-09-041-2/+2
* | Merge branch 'ticket/154' into developJames Moger2014-09-042-36/+42
|\|
| * Fix raw serving of files/directories that do not exist in a branch/refJames Moger2014-09-042-36/+42
* | Merge branch 'ticket/153' into developJames Moger2014-09-041-2/+4
|\|
| * Quote all Lucene query args that have non-alphanumeric charactersJames Moger2014-09-041-2/+4
* | Merge branch 'ticket/152' into developJames Moger2014-09-042-12/+21
|\|
| * Fix NPEs when handling referenced milestones that do not existJames Moger2014-09-042-12/+21
* | Merge branch 'ticket/151' into developJames Moger2014-09-041-0/+14
|\|
| * Alias UTF-9 and UTF-18 as UTF-8 in JGitJames Moger2014-09-041-0/+14
* | Merge branch 'ticket/150' into developJames Moger2014-09-041-2/+5
|\|
| * Do not drop missing owners from owners paletteJames Moger2014-09-041-2/+5
| * Merged #149 "Repo creation with initial commit fails if user does not have an...James Moger2014-09-041-1/+3
| |\
* | \ Merge branch 'ticket/149' into developJames Moger2014-09-041-1/+3
|\ \ \ | | |/ | |/|
| * | Create email address for a user if unset for repo creationJames Moger2014-09-041-1/+3
* | | Merge branch 'ticket/148' into developJames Moger2014-09-042-96/+119
|\ \ \ | | |/ | |/|
| * | Do not stamp raw servlet responses with cache-control headersJames Moger2014-09-042-7/+30
| |/
* | Merge branch 'ticket/147' into developJames Moger2014-09-041-0/+3
|\|
| * Fix NPE when anonymous admins are editing a repository (issue-490)James Moger2014-09-041-0/+3
| * Merged #143 "Fix url-based password keaing in Redmine auth provider"James Moger2014-09-041-2/+3
| |\
| * \ Merged #141 "Allow gitblit baseFolder to be defined by a system property"James Moger2014-09-041-1/+1
| |\ \
* | \ \ Merge branch 'ticket/143' into developJames Moger2014-09-041-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | fix misstyped passwords leaked in log files with redmine auth providermereth2014-08-191-2/+3
* | | | Merge branch 'ticket/141' into developJames Moger2014-09-041-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Allow gitblit baseFolder to be defined by a system propertyKoen Serry2014-08-031-1/+1
| |/ /
* | | Merge branch 'ticket/140' into developJames Moger2014-09-041-397/+397
|\ \ \ | | |/ | |/|
| * | Updated french translationsRomain GAGNAIRE2014-07-251-397/+397
| |/
| * Merge branch 'ticket/139'James Moger2014-07-051-5/+2
| |\
| * \ Merged #139 "Raw link blob paths do not respect web.forwardSlashCharacter"James Moger2014-07-051-5/+6
| |\ \
| * \ \ Merged #137 "NPE in RawServlet#L265"James Moger2014-07-051-0/+9
| |\ \ \
| * \ \ \ Merged #120 "Update Korean translation"James Moger2014-07-011-4/+4
| |\ \ \ \
* | \ \ \ \ Merge branch 'ticket/139' into developJames Moger2014-07-051-5/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix raw servlet blob paths not respecting web.forwardSlashCharacterJames Moger2014-07-051-10/+8
* | | | | | Merge branch 'ticket/139' into developJames Moger2014-07-051-5/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |