aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/13939' into prep-release-3.1.5Joas Schilling2015-06-131-1/+1
|\
| * [ticket/13939] Check if loadingIndicator exists before accessing itcyberalien2015-06-131-1/+1
|/
* 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 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 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 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 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 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 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
| * | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-1214-18/+50
* | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-0917-21/+105
|\ \ \ \
| * | | | [ticket/13685] phpBB, not PhpBBbrunoais2015-06-094-4/+4
| * | | | [ticket/13685] This should take care of the restbrunoais2015-06-082-2/+2
| * | | | [ticket/13685] BUMP version to 3.1.5-devbrunoais2015-06-071-1/+1
| * | | | [ticket/13685] Allow modifying the query for mysql native fulltext searchbrunoais2015-06-071-0/+49
| * | | | [ticket/13685] Fix tests for fulltext searchbrunoais2015-06-073-3/+6
| * | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-0714-18/+50
* | | | | Merge branch '3.0.x' into 3.1.xMarc Alexander2015-06-080-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #3697 from Elsensee/ticket/13833-30xMarc Alexander2015-06-082-2/+2
| |\ \ \ \
* | \ \ \ \ Merge pull request #3663 from Elsensee/ticket/13833Marc Alexander2015-06-082-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ticket/13833-30x' into ticket/13833Oliver Schramm2015-06-082-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [ticket/13833] Prevent flooding if type=submit doesn't existOliver Schramm2015-06-082-2/+2
| | |/ / / /
* | | | | | Merge pull request #3691 from CHItA/ticket/13888Andreas Fischer2015-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
* | | | | | Merge pull request #3693 from nickvergessen/ticket/13823Tristan Darricau2015-06-071-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
|/ / / / /
* | | | | Merge pull request #3692 from CHItA/ticket/sec-184Joas Schilling2015-06-071-1/+1
|\ \ \ \ \
| * | | | | [ticket/sec-184] Fix testsCHItA2015-06-071-1/+1
|/ / / / /
* | | | | Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-074-6/+29
|\ \ \ \ \
| * | | | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-042-2/+10