aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | [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 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 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 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 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 #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 pull request #3611 from Alf007/ticket/13841Joas Schilling2015-06-041-1/+22
|\ \ \ \
| * | | | [ticket/13841] Add core event on functions_admin for topics movealf0072015-05-301-1/+22
| * | | | Merge pull request #1 from phpbb/develop-ascraeusalf0072015-05-25256-885/+4741
| |\ \ \ \
* | \ \ \ \ Merge pull request #3567 from javiexin/ticket/13795Joas Schilling2015-06-041-23/+28
|\ \ \ \ \ \
| * | | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-281-1/+2
| * | | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-041-0/+2
| * | | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-04-291-23/+25
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-044-4/+58
|\ \ \ \ \ \
| * | | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-05-282-4/+0
| * | | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| * | | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| * | | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-274-4/+62
| |/ / / / /
* | | | | | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-047-5/+215
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/13564] Add tests for unlinking account upon deleting userMarc Alexander2015-04-252-0/+158
| * | | | | [ticket/13564] Try to unlink user account for every auth providerMarc Alexander2015-03-242-0/+45
| * | | | | [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| * | | | | [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
* | | | | | Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.xCesar G2015-05-312-2/+6
|\ \ \ \ \ \
| * | | | | | [ticket/13905] Don't load loading.gif until needed.Callum Macrae2015-05-312-2/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3668 from callumacrae/js-lintingMarc Alexander2015-05-316-96/+218
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13898] Moved jshint and jscs rcs to correct dir.Callum Macrae2015-05-312-0/+0
| * | | | | [ticket/13898] Fixed all the forum_fn.js violations I understoodCallum Macrae2015-05-301-25/+37
| * | | | | [ticket/13898] Allow underscores :(Callum Macrae2015-05-302-4/+3
| * | | | | [ticket/13898] 4 spaces, not 2Callum Macrae2015-05-301-1/+1