aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-06-081-1/+1
|\ | | | | | | | | Conflicts: phpBB/posting.php
| * Merge branch 'ticket/13833-30x' into ticket/13833Oliver Schramm2015-06-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: phpBB/posting.php PHPBB3-13833
| | * [ticket/13833] Prevent flooding if type=submit doesn't existOliver Schramm2015-06-081-1/+1
| | | | | | | | | | | | PHPBB3-13833
| | * Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-04-281-1/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | | * Merge remote-tracking branch 'phpbb-security/ticket/security-180' into ↵Andreas Fischer2015-04-281-1/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.14 * phpbb-security/ticket/security-180: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * | | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-281-1/+1
| | |/ /
| | * | [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-271-1/+1
| | | |
* | | | Merge branch '3.1.x'Tristan Darricau2015-06-071-2/+2
|\ \ \ \ | |/ / /
| * | | [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'Marc Alexander2015-06-073-4/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php phpBB/includes/acp/acp_jabber.php
| * | | Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-073-4/+28
| |\ \ \ | | | | | | | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML
| | * | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-0/+9
| | | | | | | | | | | | | | | | | | | | 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'Marc Alexander2015-06-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [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 branch '3.1.x'Joas Schilling2015-06-041-2/+43
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_post.html
| * | | | | Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-041-2/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13786] Add events to add MCP post options
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix another typo. PHPBB3-13786
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix typo. PHPBB3-13786
| | * | | | | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-2/+43
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html PHPBB3-13786
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-041-0/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-041-0/+35
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13564] Unlink user accounts upon deleting user
| | * | | | [ticket/13564] Try to unlink user account for every auth providerMarc Alexander2015-03-241-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
* | | | | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | [ticket/13777] Move module management into serviceMateBartus2015-05-311-529/+88
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | Merge branch '3.1.x'Nils Adermann2015-05-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-302-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/13790] Update phpcs
| | * | | | | [ticket/13790] Update phpcsTristan Darricau2015-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13790
* | | | | | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-292-13/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ticket/9109 Properly document and calculate the group settings with value 0
| * | | | | | | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109
| * | | | | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-081-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More test cases have been added, too. PHPBB3-9109
| * | | | | | | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-082-13/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109
* | | | | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-295-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-165-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-291-2/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils
| * | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847
| * | | | | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when quoting a post PHPBB3-13847
* | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * | | | | | | | | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| | * | | | | | | | | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 20:49:38 +0000