| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' | Marc Alexander | 2015-07-08 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: tests/template/template_includecss_test.php | ||||
| | * | [ticket/13995] Invalid avatar HTML missing space between elements | Matt Friedman | 2015-07-07 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-13995 | ||||
| | * | Merge pull request #3654 from s9e/ticket/13880 | Tristan Darricau | 2015-06-29 | 1 | -22/+50 |
| | |\ | | | | | | | | | | [ticket/13880] Automatically remove quotes that are nested too deep | ||||
| * | \ | Merge pull request #3623 from s9e/ticket/10620 | Tristan Darricau | 2015-07-07 | 3 | -1/+14 |
| |\ \ \ | | | | | | | | | | | | | [ticket/10620] Quote improvements | ||||
| | * | | | [ticket/10620] Added enhanced quotes in pm history | JoshyPHP | 2015-06-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-10620 | ||||
| | * | | | [ticket/10620] Added enhanced quotes in topic review | JoshyPHP | 2015-06-25 | 1 | -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 improvements | JoshyPHP | 2015-06-25 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | PHPBB3-10620 | ||||
| * | | | | Merge pull request #3689 from s9e/ticket/13880-fix-master | Tristan Darricau | 2015-06-29 | 1 | -22/+63 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13880] Merge branch 'fix-3.1' into fix-master | ||||
| | * \ \ \ | [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master | JoshyPHP | 2015-06-27 | 1 | -22/+63 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | PHPBB3-13880 | ||||
| | | * | | | [ticket/13880] Replaced the quote regexp to allow brackets | JoshyPHP | 2015-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the regexp used in bbcode::bbcode_cache_init() PHPBB3-13880 | ||||
| | | * | | | [ticket/13880] Automatically remove quotes that are nested too deep | JoshyPHP | 2015-06-27 | 1 | -22/+50 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13880 | ||||
| * | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| | * | | | Merge pull request #3725 from RMcGirr83/ticket/13962 | Joas Schilling | 2015-06-27 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | | | | | [ticket/13962] MCP Queue dropdown for forum selection | ||||
| | | * | | [ticket/13962] MCP Queue dropdown for forum selection | RMcGirr83 | 2015-06-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13962 | ||||
| * | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-26 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | Conflicts: phpBB/includes/mcp/mcp_post.php | ||||
| | * | | [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post | Crizzo | 2015-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13966 | ||||
| * | | | Merge pull request #3618 from marc1706/ticket/13832 | Tristan Darricau | 2015-06-24 | 4 | -30/+132 |
| |\ \ \ | | | | | | | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifier | ||||
| | * | | | [ticket/13832] Resolve minor coding issues | Marc Alexander | 2015-05-20 | 2 | -17/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Remove unused global from bbcode_init() | Marc Alexander | 2015-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Use preg_replace_callback in ucp_pm_options | Marc Alexander | 2015-05-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Use preg_replace_callback in bbcode class | Marc Alexander | 2015-05-19 | 1 | -4/+21 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Use preg_replace_callback in acp_bbcodes | Marc Alexander | 2015-05-19 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Fix code sniffer errors in message_parser.php | Marc Alexander | 2015-05-19 | 1 | -13/+65 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Do not use e modifier for bbcodes in message_parser | Marc Alexander | 2015-05-18 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Remove e modifier from bold bbcode | Marc Alexander | 2015-05-18 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Allow callables for matching bbcodes | Marc Alexander | 2015-05-18 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Do not use e modifier in message_parser | Marc Alexander | 2015-05-18 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| | * | | | [ticket/13832] Use preg_replace_callback instead of /e modifier | Marc Alexander | 2015-05-18 | 2 | -3/+23 |
| | | | | | | | | | | | | | | | | | PHPBB3-13832 | ||||
| * | | | | Merge pull request #3669 from s9e/ticket/13901 | Tristan Darricau | 2015-06-24 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13901] Add more whitespace to long quotes for readability | ||||
| | * | | | | [ticket/13901] Add more whitespace to long quotes for readability | JoshyPHP | 2015-05-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13901 | ||||
| * | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-24 | 1 | -1/+8 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge pull request #3538 from RMcGirr83/ticket/13759 | Marc Alexander | 2015-06-24 | 1 | -1/+8 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13759] Take post_time into account | ||||
| | | * | | | | [ticket/13759] Take post_time into account | RMcGirr83 | 2015-04-21 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13759 | ||||
| * | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3528 from RMcGirr83/ticket/13598 | Marc Alexander | 2015-06-24 | 1 | -0/+1 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | [ticket/13598] Allow topic lock on topic creation | ||||
| | | * | | | | [ticket/13598] Allow topic lock on topic creation | Richard McGirr | 2015-04-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13598 | ||||
| * | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13948] Correctly forwarding to the RIR for whois feature | ||||
| | * | | | | | [ticket/13948] Correctly forwarding to the RIR for whois feature | rxu | 2015-06-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow any space count in the ReferralServer string for whois services response. PHPBB3-13948 | ||||
| * | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-17 | 1 | -4/+6 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | [ticket/13882] Add lazy load avatars to phpbb wrappers | Matt Friedman | 2015-06-16 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882 | ||||
| * | | | | | | Merge pull request #3661 from marc1706/ticket/6466 | Tristan Darricau | 2015-06-17 | 1 | -18/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips | ||||
| | * | | | | | | [ticket/6466] Support form reset and do not loose role upon resubmit | Marc Alexander | 2015-05-30 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466 | ||||
| | * | | | | | | [ticket/6466] Remove remnants of old code | Marc Alexander | 2015-05-29 | 1 | -20/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466 | ||||
| | * | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips | Marc Alexander | 2015-05-29 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466 | ||||
| * | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-16 | 2 | -4/+27 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php | ||||
| | * | | | | | | Merge pull request #3653 from callumacrae/ticket/13882 | Marc Alexander | 2015-06-16 | 2 | -4/+27 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars. | ||||
| | | * | | | | | | [ticket/13882] no more egyptian brackets /o/ | Callum Macrae | 2015-05-30 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882 | ||||
| | | * | | | | | | [ticket/13882] Lazy load the notification avatars. | Callum Macrae | 2015-05-28 | 2 | -4/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882 | ||||
| * | | | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-06-13 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table | ||||
| | * | | | | | | | Merge pull request #3703 from javiexin/ticket/10711 | Andreas Fischer | 2015-06-13 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table | ||||
