aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-116-13/+127
|\
| * [3.1.x] Increase dev version to 3.1.6-devJoas Schilling2015-06-113-4/+4
| * Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-1110-20/+134
| |\
| | * Merge pull request #3699 from nickvergessen/ticket/13823Joas Schilling2015-06-101-5/+5
| | |\
| | | * [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | * | Merge branch '3.0.x' into prep-release-3.1.5Joas Schilling2015-06-102-7/+7
| | |\ \ | | | |/ | | |/|
| | | * Merge pull request #3700 from Nicofuma/ticket/13823Joas Schilling2015-06-102-7/+7
| | | |\
| | | | * [ticket/13823] Change diff options while packaging to not ignore all whitespacesTristan Darricau2015-06-102-7/+7
| | | |/
| | * | [prep-release-3.1.5] Add changelog for 3.1.5-RC1Joas Schilling2015-06-091-0/+83
| | * | [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| | * | [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-096-8/+8
| |/ /
* | | Merge branch '3.1.x'Andreas Fischer2015-06-091-1/+5
|\ \ \
| * \ \ Merge pull request #3685 from Nicofuma/ticket/13923Andreas Fischer2015-06-091-1/+5
| |\ \ \
| | * | | [ticket/13923] CSTristan Darricau2015-06-091-1/+1
| | * | | [ticket/13923] Update startup.phpAJ Quick2015-06-061-1/+5
* | | | | Merge branch '3.1.x'Andreas Fischer2015-06-090-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-0912-19/+82
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-0910-14/+77
|\ \ \ \ \
| * | | | | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| * | | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-089-13/+76
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-086-15/+15
| | * | | | [ticket/13930] Use OpeningParenthesisSniff in legacy rulesetMarc Alexander2015-06-082-3/+3
| | * | | | [ticket/13930] Remove not needed return statementsMarc Alexander2015-06-081-2/+0
| | * | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
| | * | | | [ticket/13930] Check for correct spacing between keyword & parenthesisMarc Alexander2015-06-072-0/+65
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-093-4/+214
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-093-4/+214
| |\ \ \ \ \
| | * | | | | [ticket/13779] Add permission set testsrxu2015-06-062-0/+196
| | * | | | | [ticket/13779] Set new auth options to the role only if matching the role typerxu2015-04-261-4/+18
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3486 from brunoais/ticket/13693Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \
| | * | | | | | [ticket/13693] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13693] Allow modifying the MySQL author search querybrunoais2015-03-121-0/+49
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3485 from brunoais/ticket/13694Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13694] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | | [ticket/13694] Allow modifying the Postgres native author search querybrunoais2015-03-121-0/+49
| | |/ / / / / /
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3484 from brunoais/ticket/13691Marc Alexander2015-06-091-0/+43
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13691] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | | [ticket/13691] Allow changing query to search for posts by author in nativebrunoais2015-03-121-0/+43
| | |/ / / / / /
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3483 from brunoais/ticket/13686Marc Alexander2015-06-091-0/+62
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13686] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | | [ticket/13686] Allow modify query used for counting in fulltext_nativebrunoais2015-03-121-0/+62
| | |/ / / / / /
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3481 from brunoais/ticket/13689Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13689] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext searchbrunoais2015-03-121-0/+49
| | |/ / / / / /
| | * | | | | | [ticket/13685] Fix tests for fulltext searchbrunoais2015-03-123-3/+6