summaryrefslogtreecommitdiffstats
path: root/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1160 from fzs/sshLdapAuthenticatorFlorian Zschocke2016-12-188-286/+833
|\
| * Extend documentation in default.properties and LdapKeyManager.java.merged--sshLdapAuthenticatorFlorian Zschocke2016-12-061-1/+26
| * The public key manager can disable writing keys, which hides commandsFlorian Zschocke2016-12-066-12/+63
| * Retrieve public SSH keys from LDAP.Florian Zschocke2016-11-293-37/+481
| * Extract LdapConnection into new class from LdapAuthProviderFlorian Zschocke2016-11-232-268/+295
* | Remove duplicate import of class SecureRandomFlorian Zschocke2016-12-151-1/+0
* | Merge pull request #1167 from fzs/secureCookiesJames Moger2016-12-142-1/+16
|\ \
| * | Set secure session cookies when redirecting from HTTP to HTTPS.merged--secureCookiesFlorian Zschocke2016-12-101-1/+2
| * | Set secure user cookies and only for HTTP.Florian Zschocke2016-12-101-0/+14
* | | Merge branch 'rcaa-master' into master.Florian Zschocke2016-12-1312-12/+103
|\ \ \
| * | | Introduce SecureRandom wrapper for properly seeded static instancesFlorian Zschocke2016-12-122-5/+88
| * | | changing Math.random to SecureRandomrcaa2016-12-111-1/+5
| * | | removing unecessary user cookie codeRodrigo Andrade2016-08-157-8/+8
| * | | removing duplicated code for cookie genaration and adding random bytes to gen...Rodrigo Andrade2016-08-155-4/+8
* | | | Merge branch 'fixMentionsInTickets-985'Florian Zschocke2016-12-124-6/+15
|\ \ \ \
| * | | | Fix user mention regular expression and group replacement.merged--fixMentionsInTickets-985Florian Zschocke2016-12-104-4/+4
| * | | | Use REGEX_TICKET_MENTION instead of hardcoded regular expressionGlenn Matthys2016-12-103-3/+6
| * | | | Introduce new constant REGEX_TICKET_MENTIONGlenn Matthys2016-12-101-0/+6
| | |/ / | |/| |
* | | | Merge pull request #1152 from fzs/fixAdminRoleLDAPJames Moger2016-11-181-12/+32
|\ \ \ \ | | |_|/ | |/| |
| * | | Set "can admin" permission on LDAP users and teams correctlymerged--fixAdminRoleLDAPFlorian Zschocke2016-11-181-12/+32
* | | | Merge pull request #1147 from tomaswolf/disabled_pager_linksJames Moger2016-11-142-2/+4
|\ \ \ \
| * | | | Fix disabled links in PagerPanelTom2016-10-312-2/+4
* | | | | Merge pull request #1149 from fzs/fixLDAPbindingJames Moger2016-11-141-114/+284
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / Clean up `LdapAuthProvider` to properly cover different LDAP search scenarios.Florian Zschocke2016-11-111-114/+284
| |/ /
* | | Merge pull request #1144 from fzs/logSendFailedExceptionJames Moger2016-10-281-1/+16
|\ \ \
| * | | Improve logging when sending email fails.merged-logSendFailedExceptionFlorian Zschocke2016-10-271-1/+16
| |/ /
* | | Merge pull request #1142 from fzs/merge-strategyJames Moger2016-10-289-70/+336
|\ \ \
| * | | Add merge type setting to repository page.merged--merge-strategyFlorian Zschocke2016-10-283-1/+10
| * | | Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-286-69/+326
| |/ /
* | | Issue #1076: load commit cache in a background threadTom2016-10-273-78/+103
* | | Spelling mistake fixlarsmaes2016-09-161-1/+1
| |/ |/|
* | 1.8.x tranditional chinese translationwilliam2016-08-041-27/+21
* | 1.8.x tranditional chinese translation after user experiencewilliam2016-08-042-712/+729
|/
* Merge pull request #1087 from mereth/issues/964-session-loss-redirects-to-sta...Paul Martin2016-06-191-0/+1
|\
| * add missing redirect after restoring user in new sessionmereth2016-06-151-0/+1
* | Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-189-200/+930
|\ \ | |/ |/|
| * Ticket Reference handling #1048Paul Martin2016-04-279-200/+930
* | fix baseURL handling in HttpUtils, fixes #1083Dirk Steinkopf2016-06-121-2/+14
* | Fixes #1062 - Upgraded to Prosemirror 0.6.1Paul Martin2016-04-291-3/+2
* | Merge pull request #1070 from gitblit/1061-filestoreSortByDatePaul Martin2016-04-282-3/+48
|\ \
| * | Fixes #1061 - Most recent first on filestore pagePaul Martin2016-04-282-3/+48
| |/
* / Use getInteger not getFilesize, fixes #1049James Moger2016-04-201-1/+1
|/
* fixes #966 to prevent always searching all reposPaul Martin2016-04-161-3/+6
* Fixes #1028 - FilestorePage now pages and filtersPaul Martin2016-04-083-20/+180
* Fix for #962 - Delete patchset abilityPaul Martin2016-04-066-9/+182
* Fix for #1042 - Filestore items now shown as iconsPaul Martin2016-04-067-48/+13
* Fixes #882 Honour allow new ticket settingPaul Martin2016-04-061-1/+1
* Fix for #1037 myTickets now honours permissionsPaul Martin2016-04-041-5/+13
* Fix for #1034 Ticket Page ErrorPaul Martin2016-03-311-8/+10
* Friendly URL for EditFile Page #974Paul Martin2016-03-275-13/+37