aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
|\ | | | | | | | | Conflicts: tests/template/template_includecss_test.php
| * [ticket/13995] Invalid avatar HTML missing space between elementsMatt Friedman2015-07-071-1/+1
| | | | | | | | PHPBB3-13995
| * Merge pull request #3654 from s9e/ticket/13880Tristan Darricau2015-06-291-22/+50
| |\ | | | | | | | | | [ticket/13880] Automatically remove quotes that are nested too deep
* | \ Merge pull request #3623 from s9e/ticket/10620Tristan Darricau2015-07-073-1/+14
|\ \ \ | | | | | | | | | | | | [ticket/10620] Quote improvements
| * | | [ticket/10620] Added enhanced quotes in pm historyJoshyPHP2015-06-251-0/+2
| | | | | | | | | | | | | | | | PHPBB3-10620
| * | | [ticket/10620] Added enhanced quotes in topic reviewJoshyPHP2015-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for enhanced quotes in topic_review's quote button. NOTE: the UI doesn't appear to be testable via PhantomJS. PHPBB3-10620
| * | | [ticket/10620] Implemented quote improvementsJoshyPHP2015-06-251-1/+10
| | | | | | | | | | | | | | | | PHPBB3-10620
* | | | Merge pull request #3689 from s9e/ticket/13880-fix-masterTristan Darricau2015-06-291-22/+63
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13880] Merge branch 'fix-3.1' into fix-master
| * \ \ \ [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-masterJoshyPHP2015-06-271-22/+63
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | PHPBB3-13880
| | * | | [ticket/13880] Replaced the quote regexp to allow bracketsJoshyPHP2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the regexp used in bbcode::bbcode_cache_init() PHPBB3-13880
| | * | | [ticket/13880] Automatically remove quotes that are nested too deepJoshyPHP2015-06-271-22/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-13880
* | | | | 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