aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13832] Use preg_replace_callback in check_flash_bbcodesMarc Alexander2015-05-201-1/+6
* [ticket/13832] Resolve minor coding issuesMarc Alexander2015-05-202-17/+3
* [ticket/13832] Remove unused global from bbcode_init()Marc Alexander2015-05-191-1/+1
* [ticket/13832] Use preg_replace_callback in ucp_pm_optionsMarc Alexander2015-05-191-1/+3
* [ticket/13832] Use preg_replace_callback in bbcode classMarc Alexander2015-05-191-4/+21
* [ticket/13832] Use preg_replace_callback in acp_bbcodesMarc Alexander2015-05-191-4/+12
* [ticket/13832] Fix code sniffer errors in message_parser.phpMarc Alexander2015-05-191-13/+65
* [ticket/13832] Do not use e modifier for bbcodes in message_parserMarc Alexander2015-05-181-12/+12
* [ticket/13832] Remove e modifier from bold bbcodeMarc Alexander2015-05-181-2/+4
* [ticket/13832] Allow callables for matching bbcodesMarc Alexander2015-05-181-1/+8
* [ticket/13832] Do not use e modifier in message_parserMarc Alexander2015-05-181-4/+12
* [ticket/13832] Use preg_replace_callback instead of /e modifierMarc Alexander2015-05-182-3/+23
* Merge branch '3.1.x'Nicofuma2015-05-171-3/+23
|\
| * Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
| |\
| | * [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | * [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
* | | Merge branch '3.1.x'Joas Schilling2015-05-169-10/+167
|\ \ \ | |/ /
| * | Merge pull request #3606 from Nicofuma/ticket/13838Joas Schilling2015-05-169-10/+167
| |\ \
| | * | [ticket/13838] Fix coding styleNicofuma2015-05-148-11/+22
| | * | [ticket/13838] Check braces for control structuresNicofuma2015-05-142-0/+146
* | | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-167-1/+42
|\ \ \ \
| * | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-047-1/+42
* | | | | Merge branch '3.1.x'Oliver Schramm2015-05-152-0/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3563 from rxu/ticket/13791Oliver Schramm2015-05-152-0/+18
| |\ \ \ \
| | * | | | [ticket/13791] Add more post buttons template events to viewtopic_body.htmlrxu2015-05-012-0/+18
* | | | | | Merge pull request #3609 from Nicofuma/ticket/13839Andreas Fischer2015-05-141-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/13839] Don't be dependent on the phpBB root directory name in testsNicofuma2015-05-141-1/+1
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-141-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3607 from Nicofuma/ticket/13830Marc Alexander2015-05-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/13830] Fix unsused used statements and catch blocksNicofuma2015-05-141-1/+1
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge pull request #3582 from s9e/ticket/13805Nicofuma2015-05-142-7/+129
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parserJoshyPHP2015-05-022-7/+129
* | | | | | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-1414-29/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| * | | | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-0514-29/+72
* | | | | | | | | Merge pull request #3577 from MateBartus/ticket/13800Nicofuma2015-05-146-29/+33
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [ticket/13800] Make router's extension manager dependency optionalMateBartus2015-05-026-29/+33
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-142-2/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3540 from RMcGirr83/ticket/13699Marc Alexander2015-05-143-3/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | [ticket/13699] Add event before and after forum title in viewforumRichard McGirr2015-05-053-3/+20
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-141-0/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3605 from Nicofuma/ticket/13830Marc Alexander2015-05-141-0/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13830] Check class used in catch statementsNicofuma2015-05-101-0/+14
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3602 from s9e/ticket/13828Marc Alexander2015-05-102-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13828] Renamed testing doubles to avoid PHP7 keywordsJoshyPHP2015-05-102-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3599 from marc1706/ticket/13825Nicofuma2015-05-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnailMarc Alexander2015-05-081-1/+1
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-082-0/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3530 from VSEphpbb/ticket/13753Marc Alexander2015-05-082-0/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/13753] Fix event documentationMatt Friedman2015-04-091-4/+4