| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1160 from fzs/sshLdapAuthenticator | Florian Zschocke | 2016-12-18 | 14 | -625/+2276 |
|\ |
|
| * | Extend documentation in default.properties and LdapKeyManager.java.merged--sshLdapAuthenticator | Florian Zschocke | 2016-12-06 | 2 | -2/+31 |
| * | The public key manager can disable writing keys, which hides commands | Florian Zschocke | 2016-12-06 | 6 | -12/+63 |
| * | Fix SshKeysDispatcher test failing on Windows | Florian Zschocke | 2016-12-06 | 1 | -7/+7 |
| * | Use dynamic port selection for LDAP listeners in LDAP tests. | Florian Zschocke | 2016-12-06 | 1 | -10/+11 |
| * | Retrieve public SSH keys from LDAP. | Florian Zschocke | 2016-11-29 | 6 | -37/+1248 |
| * | Extract LdapConnection into new class from LdapAuthProvider | Florian Zschocke | 2016-11-23 | 3 | -268/+543 |
| * | Create base unit test class for LDAP tests. | Florian Zschocke | 2016-11-23 | 2 | -332/+416 |
* | | Remove duplicate import of class SecureRandom | Florian Zschocke | 2016-12-15 | 1 | -1/+0 |
* | | Merge pull request #1167 from fzs/secureCookies | James Moger | 2016-12-14 | 2 | -1/+16 |
|\ \ |
|
| * | | Set secure session cookies when redirecting from HTTP to HTTPS.merged--secureCookies | Florian Zschocke | 2016-12-10 | 1 | -1/+2 |
| * | | Set secure user cookies and only for HTTP. | Florian Zschocke | 2016-12-10 | 1 | -0/+14 |
* | | | Merge branch 'rcaa-master' into master. | Florian Zschocke | 2016-12-13 | 13 | -12/+136 |
|\ \ \ |
|
| * | | | Introduce SecureRandom wrapper for properly seeded static instances | Florian Zschocke | 2016-12-12 | 3 | -5/+121 |
| * | | | changing Math.random to SecureRandom | rcaa | 2016-12-11 | 1 | -1/+5 |
| * | | | removing unecessary user cookie code | Rodrigo Andrade | 2016-08-15 | 7 | -8/+8 |
| * | | | removing duplicated code for cookie genaration and adding random bytes to gen... | Rodrigo Andrade | 2016-08-15 | 5 | -4/+8 |
* | | | | Merge branch 'fixMentionsInTickets-985' | Florian Zschocke | 2016-12-12 | 5 | -7/+88 |
|\ \ \ \ |
|
| * | | | | Fix user mention regular expression and group replacement.merged--fixMentionsInTickets-985 | Florian Zschocke | 2016-12-10 | 5 | -5/+77 |
| * | | | | Use REGEX_TICKET_MENTION instead of hardcoded regular expression | Glenn Matthys | 2016-12-10 | 3 | -3/+6 |
| * | | | | Introduce new constant REGEX_TICKET_MENTION | Glenn Matthys | 2016-12-10 | 1 | -0/+6 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #1152 from fzs/fixAdminRoleLDAP | James Moger | 2016-11-18 | 3 | -19/+296 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Set "can admin" permission on LDAP users and teams correctlymerged--fixAdminRoleLDAP | Florian Zschocke | 2016-11-18 | 3 | -19/+296 |
* | | | | Merge pull request #1147 from tomaswolf/disabled_pager_links | James Moger | 2016-11-14 | 3 | -2/+29 |
|\ \ \ \ |
|
| * | | | | Fix disabled links in PagerPanel | Tom | 2016-10-31 | 3 | -2/+29 |
* | | | | | Merge pull request #1149 from fzs/fixLDAPbinding | James Moger | 2016-11-14 | 3 | -144/+623 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Update documentation for LDAP binding in default.properties.merged--fixLDAPbinding | Florian Zschocke | 2016-11-14 | 1 | -2/+15 |
| * | | | Clean up `LdapAuthProvider` to properly cover different LDAP search scenarios. | Florian Zschocke | 2016-11-11 | 1 | -114/+284 |
| * | | | Extend LDAP tests to use LDAP servers with access restrictions. | Florian Zschocke | 2016-11-09 | 1 | -45/+257 |
| * | | | Extend LDAP authentication tests to use different modes. | Florian Zschocke | 2016-11-06 | 1 | -23/+107 |
| |/ / |
|
* | | | Merge pull request #1144 from fzs/logSendFailedException | James Moger | 2016-10-28 | 1 | -1/+16 |
|\ \ \ |
|
| * | | | Improve logging when sending email fails.merged-logSendFailedException | Florian Zschocke | 2016-10-27 | 1 | -1/+16 |
| |/ / |
|
* | | | Merge pull request #1142 from fzs/merge-strategy | James Moger | 2016-10-28 | 10 | -70/+351 |
|\ \ \ |
|
| * | | | Add merge type setting to repository page.merged--merge-strategy | Florian Zschocke | 2016-10-28 | 3 | -1/+10 |
| * | | | Add integration strategy to merge tickes fast-forward or with commit. | Florian Zschocke | 2016-10-28 | 7 | -69/+341 |
| |/ / |
|
* | | | Issue #1076: load commit cache in a background thread | Tom | 2016-10-27 | 3 | -78/+103 |
* | | | Spelling mistake fix | larsmaes | 2016-09-16 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge pull request #1110 from WilliamFromTW/master | James Moger | 2016-08-05 | 2 | -714/+725 |
|\ \ |
|
| * | | 1.8.x tranditional chinese translation | william | 2016-08-04 | 1 | -27/+21 |
| * | | 1.8.x tranditional chinese translation after user experience | william | 2016-08-04 | 2 | -712/+729 |
| |/ |
|
* / | Fix &rt; to > in mail (in rename status line) | Guilliam Xavier | 2016-07-29 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1087 from mereth/issues/964-session-loss-redirects-to-sta... | Paul Martin | 2016-06-19 | 1 | -0/+1 |
|\ |
|
| * | add missing redirect after restoring user in new session | mereth | 2016-06-15 | 1 | -0/+1 |
* | | Merge pull request #1055 from gitblit/1048-TicketReferences | Paul Martin | 2016-06-18 | 14 | -201/+1926 |
|\ \
| |/
|/| |
|
| * | TicketReference Testing #1048 | Paul Martin | 2016-06-18 | 1 | -4/+36 |
| * | Ticket Reference handling #1048 | Paul Martin | 2016-04-27 | 14 | -201/+1894 |
* | | Merge pull request #1084 from metasim/youtrack-hook | James Moger | 2016-06-13 | 2 | -0/+254 |
|\ \ |
|
| * | | Initial implementation of a JetBrains YouTrack hook for GitBlit. | Simeon H.K. Fitch | 2016-06-03 | 2 | -0/+254 |
* | | | fix baseURL handling in HttpUtils, fixes #1083 | Dirk Steinkopf | 2016-06-12 | 1 | -2/+14 |
* | | | Fixes #1062 - Upgraded to Prosemirror 0.6.1 | Paul Martin | 2016-04-29 | 4 | -29/+36 |