aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-06-131-0/+4
|\ | | | | | | | | * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table
| * Merge pull request #3703 from javiexin/ticket/10711Andreas Fischer2015-06-131-0/+4
| |\ | | | | | | | | | | | | | | | | | | [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table
| | * [ticket/10711] Duplicate key error on forum_tracks_tablejaviexin2015-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711
| * | [3.1.x] Update dev version to 3.1.6-RC1Joas Schilling2015-06-111-1/+1
| | |
| * | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-112-6/+6
| |\ \
* | \ \ Merge branch '3.1.x'Joas Schilling2015-06-111-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | [3.1.x] Increase dev version to 3.1.6-devJoas Schilling2015-06-111-1/+1
| | |/ / | |/| |
| * | | [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | | | | | | | | | PHPBB3-13823
| * | | [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-091-1/+1
| | | |
* | | | Merge branch '3.1.x'Andreas Fischer2015-06-091-1/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * 3.1.x: [ticket/13923] CS [ticket/13923] Update startup.php
| * | | Merge pull request #3685 from Nicofuma/ticket/13923Andreas Fischer2015-06-091-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13923] Update startup.php * Nicofuma/ticket/13923: [ticket/13923] CS [ticket/13923] Update startup.php
| | * | | [ticket/13923] CSTristan Darricau2015-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13923
| | * | | [ticket/13923] Update startup.phpAJ Quick2015-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While suppressing the output from the 'set_magic_quotes_runtime(0)' is sufficient with normal phpBB installs, using this file in association with the oauth plugin will cause an error on some versions of PHP. This fixes a potential bug where set_magic_quotes_runtime is depreciated in newer versions of PHP. PHPBB3-13923
| * | | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-095-14/+14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
* | | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-093-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * \ \ \ \ Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-083-9/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-085-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
* | | | | | Merge branch '3.1.x'Marc Alexander2015-06-096-8/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-096-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | | | [ticket/13685] This should take care of the restbrunoais2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-076-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 02:36:26 +0000