aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| | | | PHPBB3-13930
* Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-089-13/+76
|\ | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| * [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-086-15/+15
| | | | | | | | PHPBB3-13930
| * [ticket/13930] Use OpeningParenthesisSniff in legacy rulesetMarc Alexander2015-06-082-3/+3
| | | | | | | | PHPBB3-13930
| * [ticket/13930] Remove not needed return statementsMarc Alexander2015-06-081-2/+0
| | | | | | | | PHPBB3-13930
| * [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
| | | | | | | | PHPBB3-13930
| * [ticket/13930] Check for correct spacing between keyword & parenthesisMarc Alexander2015-06-072-0/+65
| | | | | | | | | | | | | | The codesniffer should check for a correct spacing between keywords like if or foreach and its opening parenthesis. PHPBB3-13930
* | Merge pull request #3690 from s9e/ticket/13902Andreas Fischer2015-06-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13902] Increased CSS margin around quotes * s9e/ticket/13902: [ticket/13902] Increased CSS margin around quotes
| * | [ticket/13902] Increased CSS margin around quotesJoshyPHP2015-06-071-2/+2
| | | | | | | | | | | | PHPBB3-13902
* | | Merge branch '3.1.x'Andreas Fischer2015-06-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13888] Fix sql_freeresult() error on author searches
| * \ \ Merge pull request #3691 from CHItA/ticket/13888Andreas Fischer2015-06-081-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | [ticket/13888] Fix sql_freeresult() error on author searches * CHItA/ticket/13888: [ticket/13888] Fix sql_freeresult() error on author searches
| | * | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13888
* | | | 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 brackets
| | * | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
| |/ / | | | | | | | | | | | | | | | | | | This changes the line with non-whitespace changes, so the packaging script should correctly detect them as changed and put the file into the update. PHPBB3-13823
* | | 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 tests
| | * | [ticket/sec-184] Fix testsCHItA2015-06-071-1/+1
| |/ / | | | | | | | | | SECURITY-184
* | | Merge branch '3.1.x'Marc Alexander2015-06-074-6/+29
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: phpBB/includes/acp/acp_board.php phpBB/includes/acp/acp_jabber.php
| * Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-074-6/+29
| |\ | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML
| | * [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-042-2/+10
| | | | | | | | | | | | SECURITY-184
| | * [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | | | | | | | | | | | SECURITY-184
| | * [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-042-2/+14
| | | | | | | | | | | | SECURITY-184
* | | 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 permissions
| | * | [ticket/13913] Correctly check the forum_password and read permissionsJoas Schilling2015-06-041-5/+14
| | |/ | | | | | | | | | | | | | | | | | | We need to check them on the forum the post is in, rather than the forum row we are displaying. PHPBB3-13913
* | | 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 index
| | * | [ticket/9563] Do not show empty categories on indexMarc Alexander2015-05-311-1/+13
| | | | | | | | | | | | | | | | PHPBB3-9563
* | | | 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] Use hash_equals() if possible in password driver helper
| | * | | [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13917
| | * | | [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| | | |/ | | |/| | | | | | | | | PHPBB3-13917
* | | | Merge branch '3.1.x'Tristan Darricau2015-06-068-13/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/index_body.html phpBB/styles/subsilver2/template/login_body.html phpBB/styles/subsilver2/template/login_forum.html phpBB/styles/subsilver2/template/ucp_login_link.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html phpBB/styles/subsilver2/template/ucp_register.html phpBB/styles/subsilver2/template/viewforum_body.html
| * | | Merge pull request #3681 from marc1706/ticket/13200Tristan Darricau2015-06-0615-25/+25
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13200] Disable autocomplete for sensitive input fields
| | * | | [ticket/13200] Disable autocomplete for sensitive input fieldsMarc Alexander2015-06-0415-25/+25
| | |/ / | | | | | | | | | | | | PHPBB3-13200
* | | | Merge pull request #3682 from marc1706/ticket/13564Tristan Darricau2015-06-051-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13564] Fix user_delete_test on master
| * | | | [ticket/13564] Fix user_delete_test on masterMarc Alexander2015-06-041-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13564
* | | | | 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 branch
| | * | | [ticket/13841] Fix tests on 3.1 and master branchCHItA2015-06-051-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13841
* | | | Merge branch '3.1.x'Joas Schilling2015-06-041-1/+22
|\ \ \ \ | |/ / /
| * | | Merge pull request #3611 from Alf007/ticket/13841Joas Schilling2015-06-041-1/+22
| |\ \ \ | | | | | | | | | | | | | | | Ticket/13841
| | * | | [ticket/13841] Add core event on functions_admin for topics movealf0072015-05-301-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event added for the function move_topics() in includes/functions_admin.php, so that you can insert any extension's table(s) to be updated when topics are moved between forums Added parameters topic_ids, forum_id, forum_ids and auto_sync PHPBB3-13841
| | * | | Merge pull request #1 from phpbb/develop-ascraeusalf0072015-05-25256-885/+4741
| | |\ \ \ | | | | | | | | | | | | Develop ascraeus
* | | \ \ \ Merge branch '3.1.x'Joas Schilling2015-06-041-23/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3567 from javiexin/ticket/13795Joas Schilling2015-06-041-23/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13795] Modify core event in posting to include poll data
| | * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. Also include the poll variable in the parameter list for event core.posting_modify_submission_errors, as it was missing, and any modification here on post_data for poll related data is silently ignored. Added correct @change tags to both events. PHPBB3-13795
| | * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. Also include the poll variable in the parameter list for event core.posting_modify_submission_errors, as it was missing, and any modification here on post_data for poll related data is silently ignored. PHPBB3-13795
| | * | | | | [ticket/13795] Modify core event in posting to include poll datajaviexin2015-04-291-23/+25
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the core.posting_modify_template_vars event in posting.php to extend the content of the page_data array to include poll data. That required moving the event and merging the new set of template vars. PHPBB3-13795
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:18:06 +0000