aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-06-0917-21/+105
|\
| * 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.1.x'Marc Alexander2015-06-082-2/+2
|\ \ \ | |/ /
| * | 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 #3690 from s9e/ticket/13902Andreas Fischer2015-06-081-2/+2
|\ \ \ \ \
| * | | | | [ticket/13902] Increased CSS margin around quotesJoshyPHP2015-06-071-2/+2
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-081-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch '3.1.x'Tristan Darricau2015-06-071-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x'Joas Schilling2015-06-071-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3692 from CHItA/ticket/sec-184Joas Schilling2015-06-071-1/+1
| |\ \ \ \
| | * | | | [ticket/sec-184] Fix testsCHItA2015-06-071-1/+1
| |/ / / /
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-074-6/+29
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | 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
| | * | | [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | * | | [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-042-2/+14
* | | | | Merge branch '3.1.x'Tristan Darricau2015-06-061-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #23 from phpbb/ticket/13913Tristan Darricau2015-06-061-5/+14
| |\ \ \ \
| | * | | | [ticket/13913] Correctly check the forum_password and read permissionsJoas Schilling2015-06-041-5/+14
| | |/ / /
* | | | | Merge branch '3.1.x'Tristan Darricau2015-06-061-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3671 from marc1706/ticket/9563Tristan Darricau2015-06-061-1/+13
| |\ \ \ \
| | * | | | [ticket/9563] Do not show empty categories on indexMarc Alexander2015-05-311-1/+13
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x'Tristan Darricau2015-06-061-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3680 from marc1706/ticket/13917Tristan Darricau2015-06-061-2/+14
| |\ \ \ \
| | * | | | [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| | * | | | [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| | | |/ / | | |/| |
* | | | | Merge branch '3.1.x'Tristan Darricau2015-06-068-13/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3681 from marc1706/ticket/13200Tristan Darricau2015-06-0615-25/+25
| |\ \ \ \
| | * | | | [ticket/13200] Disable autocomplete for sensitive input fieldsMarc Alexander2015-06-0415-25/+25
| | |/ / /
* | | | | Merge pull request #3682 from marc1706/ticket/13564Tristan Darricau2015-06-051-4/+5
|\ \ \ \ \
| * | | | | [ticket/13564] Fix user_delete_test on masterMarc Alexander2015-06-041-4/+5
* | | | | | Merge branch '3.1.x'Marc Alexander2015-06-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #3684 from CHItA/ticket/13841Marc Alexander2015-06-051-1/+1
| |\ \ \ \
| | * | | | [ticket/13841] Fix tests on 3.1 and master branchCHItA2015-06-051-1/+1
| |/ / / /
* | | | | Merge branch '3.1.x'Joas Schilling2015-06-041-1/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3611 from Alf007/ticket/13841Joas Schilling2015-06-041-1/+22
| |\ \ \ \