summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Extract LdapConnection into new class from LdapAuthProviderFlorian Zschocke2016-11-233-268/+543
| * | Create base unit test class for LDAP tests.Florian Zschocke2016-11-232-332/+416
* | | 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-1313-12/+136
|\ \ \
| * | | Introduce SecureRandom wrapper for properly seeded static instancesFlorian Zschocke2016-12-123-5/+121
| * | | 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-125-7/+88
|\ \ \ \
| * | | | Fix user mention regular expression and group replacement.merged--fixMentionsInTickets-985Florian Zschocke2016-12-105-5/+77
| * | | | 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-183-19/+296
|\ \ \ \ | | |_|/ | |/| |
| * | | Set "can admin" permission on LDAP users and teams correctlymerged--fixAdminRoleLDAPFlorian Zschocke2016-11-183-19/+296
* | | | Merge pull request #1147 from tomaswolf/disabled_pager_linksJames Moger2016-11-143-2/+29
|\ \ \ \
| * | | | Fix disabled links in PagerPanelTom2016-10-313-2/+29
* | | | | Merge pull request #1149 from fzs/fixLDAPbindingJames Moger2016-11-143-144/+623
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Update documentation for LDAP binding in default.properties.merged--fixLDAPbindingFlorian Zschocke2016-11-141-2/+15
| * | | Clean up `LdapAuthProvider` to properly cover different LDAP search scenarios.Florian Zschocke2016-11-111-114/+284
| * | | Extend LDAP tests to use LDAP servers with access restrictions.Florian Zschocke2016-11-091-45/+257
| * | | Extend LDAP authentication tests to use different modes.Florian Zschocke2016-11-061-23/+107
| |/ /
* | | 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-2810-70/+351
|\ \ \
| * | | 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-287-69/+341
| |/ /
* | | Merge pull request #1140 from tomaswolf/issue_1076James Moger2016-10-273-78/+103
|\ \ \
| * | | Issue #1076: load commit cache in a background threadTom2016-10-273-78/+103
|/ / /
* | | Merge pull request #1130 from larsmaes/patch-2James Moger2016-09-161-1/+1
|\ \ \ | |_|/ |/| |
| * | Spelling mistake fixlarsmaes2016-09-161-1/+1
|/ /
* | Merge pull request #1110 from WilliamFromTW/masterJames Moger2016-08-052-714/+725
|\ \
| * | 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 #1105 from guilliamxavier/patch-1James Moger2016-07-291-1/+1
|\ \ \ | |/ / |/| |
| * | Fix &rt; to > in mail (in rename status line)Guilliam Xavier2016-07-291-1/+1
|/ /
* / Reset build identifiers for next point release cycleJames Moger2016-06-222-2/+20
|/
* Prepare 1.8.0 releasev1.8.0James Moger2016-06-222-10/+10
* Update documentation for 1.8.0 releaseJames Moger2016-06-222-96/+37
* 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-1814-201/+1926
|\ \ | |/ |/|
| * TicketReference Testing #1048Paul Martin2016-06-181-4/+36
| * Ticket Reference handling #1048Paul Martin2016-04-2714-201/+1894
* | Merge pull request #1084 from metasim/youtrack-hookJames Moger2016-06-132-0/+254
|\ \
| * | Initial implementation of a JetBrains YouTrack hook for GitBlit.Simeon H.K. Fitch2016-06-032-0/+254
* | | Merge pull request #1086 from dsteinkopf/masterJames Moger2016-06-131-2/+14
|\ \ \
| * | | fix baseURL handling in HttpUtils, fixes #1083Dirk Steinkopf2016-06-121-2/+14
|/ / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 10:36:57 +0000