aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3572 from s9e/ticket/8419Nicofuma2015-05-203-0/+30
|\ | | | | | | [ticket/8419] Custom tag eats up space character
| * [ticket/8419] Added regression testJoshyPHP2015-04-303-0/+30
| | | | | | | | PHPBB3-8419
* | Merge pull request #3578 from s9e/ticket/13801Nicofuma2015-05-206-35/+20
|\ \ | | | | | | | | | [ticket/13801] Remove user dependency from text_formatter.s9e.parser
| * | [ticket/13801] Updated event description [ci skip]JoshyPHP2015-05-181-2/+3
| | | | | | | | | | | | PHPBB3-13801
| * | [ticket/13801] Updated comments for clarityJoshyPHP2015-05-183-2/+4
| | | | | | | | | | | | PHPBB3-13801
| * | [ticket/13801] Removed user dependency from text_formatter.s9e.parserJoshyPHP2015-05-185-31/+13
| | | | | | | | | | | | PHPBB3-13801
* | | Merge pull request #3597 from s9e/ticket/13614Nicofuma2015-05-195-150/+29
|\ \ \ | | | | | | | | | | | | [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
| * | | [ticket/13614] Added phpbb_pcre_utf8_support() dummy for BCJoshyPHP2015-05-111-0/+9
| | | | | | | | | | | | | | | | PHPBB3-13614
| * | | [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()JoshyPHP2015-05-114-150/+20
| | | | | | | | | | | | | | | | | | | | | | | | Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code. PHPBB3-13614
* | | | Merge pull request #3617 from s9e/ticket/11530Nicofuma2015-05-194-57/+159
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/11530] Remove extra quotes when depth limit is exceeded
| * | | | [ticket/11530] Fixed test description [ci skip]JoshyPHP2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11530
| * | | | [ticket/11530] Updated s9e\TextFormatterJoshyPHP2015-05-181-56/+56
| | | | | | | | | | | | | | | | | | | | PHPBB3-11530
| * | | | [ticket/11530] Remove extra quotes when depth limit is exceededJoshyPHP2015-05-183-1/+103
| | |/ / | |/| | | | | | | | | | PHPBB3-11530
* | | | Merge branch '3.1.x'Tristan Darricau2015-05-191-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #3619 from javiexin/ticket/13852Tristan Darricau2015-05-191-4/+4
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13852] Consistent tab navigation when login in
| | * | | [ticket/13852] Consistent tab navigation when login injaviexin2015-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tabindex attribute to input elements in index_body.html to make tab navigation consistent with that of login_body.html. PHPBB3-13852
* | | | | Merge branch '3.1.x'Nicofuma2015-05-171-3/+23
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
| | * | | | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
| | * | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
* | | | | | 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] Check braces for control structures
| | * | | | | [ticket/13838] Fix coding styleNicofuma2015-05-148-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838
| | * | | | | [ticket/13838] Check braces for control structuresNicofuma2015-05-142-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-167-1/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml
| * | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-047-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632
* | | | | | | | 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.html
| | * | | | | | | [ticket/13791] Add more post buttons template events to viewtopic_body.htmlrxu2015-05-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is to allow adding custom post buttons outside of original post buttons conditionals/list in prosilver (for subsilver2 it's not the issue). PHPBB3-13791
* | | | | | | | | 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 tests * Nicofuma/ticket/13839: [ticket/13839] Don't be dependent on the phpBB root directory name in tests
| * | | | | | | | | [ticket/13839] Don't be dependent on the phpBB root directory name in testsNicofuma2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13839
* | | | | | | | | | 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 blocks
| | * | | | | | | | | [ticket/13830] Fix unsused used statements and catch blocksNicofuma2015-05-141-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13830
* | | | | | | | | | Merge pull request #3582 from s9e/ticket/13805Nicofuma2015-05-142-7/+129
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parser
| * | | | | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parserJoshyPHP2015-05-022-7/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13805
* | | | | | | | | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-1414-29/+67
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13804] Make template's user dependency optional
| * | | | | | | | | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804
| * | | | | | | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-0514-29/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804
* | | | | | | | | | | | Merge pull request #3577 from MateBartus/ticket/13800Nicofuma2015-05-146-29/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/13800] Make router's extension manager dependency optional
| * | | | | | | | | | | [ticket/13800] Make router's extension manager dependency optionalMateBartus2015-05-026-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13800
* | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-142-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | | | | | | | | Merge pull request #3540 from RMcGirr83/ticket/13699Marc Alexander2015-05-143-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ticket/13699] Add event before and after forum title in viewforum
| | * | | | | | | | | | [ticket/13699] Add event before and after forum title in viewforumRichard McGirr2015-05-053-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13699
* | | | | | | | | | | | 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 statements
| | * | | | | | | | | | | [ticket/13830] Check class used in catch statementsNicofuma2015-05-101-0/+14
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13830
* | | | | | | | | | | | Merge pull request #3602 from s9e/ticket/13828Marc Alexander2015-05-102-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/13828] Renamed testing doubles to avoid PHP7 keywords
| * | | | | | | | | | | [ticket/13828] Renamed testing doubles to avoid PHP7 keywordsJoshyPHP2015-05-102-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13828
* | | | | | | | | | | Merge pull request #3599 from marc1706/ticket/13825Nicofuma2015-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail