aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3725 from RMcGirr83/ticket/13962Joas Schilling2015-06-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | [ticket/13962] MCP Queue dropdown for forum selection
| | * | | | | | | | [ticket/13962] MCP Queue dropdown for forum selectionRMcGirr832015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13962
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | Conflicts: phpBB/includes/mcp/mcp_post.php
| * | | | | | | | [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_postCrizzo2015-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13966
* | | | | | | | | Merge pull request #3618 from marc1706/ticket/13832Tristan Darricau2015-06-244-30/+132
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifier
| * | | | | | | | | [ticket/13832] Resolve minor coding issuesMarc Alexander2015-05-202-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Remove unused global from bbcode_init()Marc Alexander2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Use preg_replace_callback in ucp_pm_optionsMarc Alexander2015-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Use preg_replace_callback in bbcode classMarc Alexander2015-05-191-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Use preg_replace_callback in acp_bbcodesMarc Alexander2015-05-191-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Fix code sniffer errors in message_parser.phpMarc Alexander2015-05-191-13/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Do not use e modifier for bbcodes in message_parserMarc Alexander2015-05-181-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Remove e modifier from bold bbcodeMarc Alexander2015-05-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Allow callables for matching bbcodesMarc Alexander2015-05-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Do not use e modifier in message_parserMarc Alexander2015-05-181-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifierMarc Alexander2015-05-182-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
* | | | | | | | | | Merge pull request #3669 from s9e/ticket/13901Tristan Darricau2015-06-241-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13901] Add more whitespace to long quotes for readability
| * | | | | | | | | | [ticket/13901] Add more whitespace to long quotes for readabilityJoshyPHP2015-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13901
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-241-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #3538 from RMcGirr83/ticket/13759Marc Alexander2015-06-241-1/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13759] Take post_time into account
| | * | | | | | | | | | [ticket/13759] Take post_time into accountRMcGirr832015-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13759
* | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #3528 from RMcGirr83/ticket/13598Marc Alexander2015-06-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ticket/13598] Allow topic lock on topic creation
| | * | | | | | | | | | [ticket/13598] Allow topic lock on topic creationRichard McGirr2015-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13598
* | | | | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13948] Correctly forwarding to the RIR for whois feature
| * | | | | | | | | | | [ticket/13948] Correctly forwarding to the RIR for whois featurerxu2015-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow any space count in the ReferralServer string for whois services response. PHPBB3-13948
* | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-171-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | [ticket/13882] Add lazy load avatars to phpbb wrappersMatt Friedman2015-06-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882
* | | | | | | | | | | | Merge pull request #3661 from marc1706/ticket/6466Tristan Darricau2015-06-171-18/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
| * | | | | | | | | | | | [ticket/6466] Support form reset and do not loose role upon resubmitMarc Alexander2015-05-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | | | | | | | | | [ticket/6466] Remove remnants of old codeMarc Alexander2015-05-291-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltipsMarc Alexander2015-05-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
* | | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-162-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php
| * | | | | | | | | | | | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-162-4/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.
| | * | | | | | | | | | | | [ticket/13882] no more egyptian brackets /o/Callum Macrae2015-05-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882
| | * | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-282-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | | | | | | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:42:09 +0000