aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-281-1/+1
|\ | | | | | | | | Conflicts: phpBB/docs/events.md
| * Merge pull request #3635 from nickvergessen/ticket/13808Marc Alexander2015-05-281-1/+1
| |\ | | | | | | | | | [ticket/13808] Fix version
| | * [ticket/13808] Fix versionJoas Schilling2015-05-281-1/+1
| | | | | | | | | | | | PHPBB3-13808
* | | [ticket/13871] Fix call to undefined member function on non-object error.Cesar G2015-05-281-3/+3
| | | | | | | | | | | | PHPBB3-13871
* | | Merge branch '3.1.x'Cesar G2015-05-281-13/+8
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
| * | Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.xCesar G2015-05-281-13/+8
| |\ \ | | |/ | |/| | | | | | | * Wolfsblvt/ticket/13787: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
| | * [ticket/13787] Remove duplicate entry of poll_delete in prosilver templateWolfsblvt2015-04-271-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When options are shown and poll delete is allowed, the option to delete polls is shown twice. This is fixed here by moving the if poll delete check out of the outer if, wich makes it also more consistent with the new event. PHPBB3-13787
* | | Merge branch '3.1.x'Joas Schilling2015-05-282-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13808] search_body_form_before Conflicts: phpBB/styles/subsilver2/template/search_body.html
| * | Merge pull request #3600 from dragosvr92/ticket/13808Joas Schilling2015-05-283-0/+10
| |\ \ | | | | | | | | | | | | [ticket/13808] search_body_form_before
| | * | [ticket/13808] search_body_form_beforedragosvr922015-05-093-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions may be designed to add secondary search options, such as Google search in the search_body.html. There are no events in the searchbody, so this should be merged. PHPBB3-13808
* | | | Merge branch '3.1.x'Joas Schilling2015-05-282-0/+69
|\ \ \ \ | |/ / /
| * | | Merge pull request #3435 from rxu/ticket/13648Joas Schilling2015-05-282-0/+69
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13648] Allow extensions using custom bbcode validation methods
| | * | | [ticket/13648] Allow extensions using custom bbcode validation methodsrxu2015-05-072-0/+69
| | | | | | | | | | | | | | | | | | | | PHPBB3-13648
* | | | | Merge branch '3.1.x'Marc Alexander2015-05-281-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensionsrxu2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13868
* | | | | [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-201-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13849] Fix development environment
| * | | | | | [ticket/13849] Fix development environmentNicofuma2015-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13849
* | | | | | | Merge pull request #3586 from s9e/ticket/13680Nicofuma2015-05-204-12/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13680] Updated quote notifications
| * | | | | | | [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authorsJoshyPHP2015-05-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13680
| * | | | | | | [ticket/13680] Updated quote notificationsJoshyPHP2015-05-154-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added get_quote_authors() to text_formatter.utils service to retrieve the names used in first-level quotes PHPBB3-13680
* | | | | | | | Merge pull request #3578 from s9e/ticket/13801Nicofuma2015-05-204-24/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-183-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801
* | | | | | | | | Merge pull request #3597 from s9e/ticket/13614Nicofuma2015-05-194-139/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-113-139/+19
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code. PHPBB3-13614
* | | | | | | | | Merge pull request #3617 from s9e/ticket/11530Nicofuma2015-05-193-57/+78
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | [ticket/11530] Remove extra quotes when depth limit is exceeded
| * | | | | | | | [ticket/11530] Updated s9e\TextFormatterJoshyPHP2015-05-181-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11530
| * | | | | | | | [ticket/11530] Remove extra quotes when depth limit is exceededJoshyPHP2015-05-182-1/+22
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 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-167-10/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3606 from Nicofuma/ticket/13838Joas Schilling2015-05-167-10/+21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13838] Check braces for control structures
| | * | | | | | | | [ticket/13838] Fix coding styleNicofuma2015-05-147-10/+21
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | | | | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-165-1/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-045-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 18:03:39 +0000