aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-281-1/+1
|\
| * Merge pull request #3631 from rxu/ticket/13868Marc Alexander2015-05-281-1/+1
| |\ | | | | | | | | | [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
| | * [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensionsrxu2015-05-271-1/+1
| |/ | | | | | | PHPBB3-13868
* | Merge pull request #3627 from imkingdavid/ticket/13769Andreas Fischer2015-05-261-5/+5
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13769] Move environment check in phpbbcli.php lower * imkingdavid/ticket/13769: [ticket/13769] Move environment check lower in phpbbcli.php
| * | [ticket/13769] Move environment check lower in phpbbcli.phpDavid King2015-05-231-5/+5
|/ / | | | | | | PHPBB3-13769
* | Merge branch '3.1.x'Marc Alexander2015-05-221-5/+3
|\ \ | |/ | | | | | | Conflicts: phpBB/phpbb/db/migration/data/v310/style_update_p1.php
| * Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
| |\ | | | | | | | | | [ticket/13861] Fix undefined variables in style update migration
| | * [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
| | | | | | | | | | | | PHPBB3-13861
* | | Merge pull request #3608 from Nicofuma/ticket/13829Marc Alexander2015-05-201-22/+37
|\ \ \ | | | | | | | | | | | | [ticket/13829] Don't fail if the cache isn't writeable
| * | | [ticket/13829] Don't fail if the cache isn't writeableNicofuma2015-05-141-22/+37
| | | | | | | | | | | | | | | | PHPBB3-13829
* | | | Merge pull request #3621 from Nicofuma/ticket/13849Marc Alexander2015-05-203-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13849] Fix development environment
| * | | | [ticket/13849] Fix testsNicofuma2015-05-192-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13849
| * | | | [ticket/13849] Fix development environmentNicofuma2015-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13849
* | | | | Merge pull request #3586 from s9e/ticket/13680Nicofuma2015-05-209-31/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13680] Updated quote notifications
| * | | | | [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authorsJoshyPHP2015-05-154-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13680
| * | | | | [ticket/13680] Updated quote notificationsJoshyPHP2015-05-159-31/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added get_quote_authors() to text_formatter.utils service to retrieve the names used in first-level quotes PHPBB3-13680
* | | | | | Merge pull request #3569 from s9e/ticket/13641Nicofuma2015-05-203-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13641] Proper parsing of custom BBCode for inline code
| * | | | | | [ticket/13641] Added regression testJoshyPHP2015-04-293-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13641
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 04:22:23 +0000