aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Nils Adermann2015-05-301-1/+1
|\ | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-302-2/+2
| |\ | | | | | | [ticket/13790] Update phpcs
| | * [ticket/13790] Update phpcsTristan Darricau2015-05-192-2/+2
| | | | | | | | | | | | PHPBB3-13790
* | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-292-13/+32
|\ \ \ | | | | | | | | | | | | Ticket/9109 Properly document and calculate the group settings with value 0
| * | | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-081-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9109
| * | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-081-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | More test cases have been added, too. PHPBB3-9109
| * | | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-082-13/+46
| | | | | | | | | | | | | | | | PHPBB3-9109
* | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-295-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-165-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-291-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils
| * | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847
| * | | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when quoting a post PHPBB3-13847
* | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * | | | | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| | * | | | | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | | [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | | [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-5/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query Conflicts: phpBB/includes/mcp/mcp_reports.php
| * | | | | | Merge pull request #3468 from brunoais/ticket/13668Joas Schilling2015-05-281-5/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report * brunoais/ticket/13668: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query
| | * | | | | | [ticket/13668] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | | [ticket/13668] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report.brunoais2015-03-051-0/+19
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | [ticket/13668] Convert the mcp report_details query to a built querybrunoais2015-03-051-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
* | | | | | | 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
* | | | | | | Merge pull request #3578 from s9e/ticket/13801Nicofuma2015-05-201-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13801] Remove user dependency from text_formatter.s9e.parser
| * | | | | | | [ticket/13801] Updated comments for clarityJoshyPHP2015-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801
| * | | | | | | [ticket/13801] Removed user dependency from text_formatter.s9e.parserJoshyPHP2015-05-181-0/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 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
* | | | | | | | [ticket/11530] Remove extra quotes when depth limit is exceededJoshyPHP2015-05-181-0/+10
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-11530
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-161-1/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | [ticket/13838] Fix coding styleNicofuma2015-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | | | Merge pull request #3582 from s9e/ticket/13805Nicofuma2015-05-141-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parser
| * | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parserJoshyPHP2015-05-021-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13805
* | | | | | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-142-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | [ticket/13804] Make template's user dependency optional
| * | | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804
* | | | | | | | Merge pull request #3599 from marc1706/ticket/13825Nicofuma2015-05-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
| * | | | | | | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnailMarc Alexander2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13825
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-7/+33
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3526 from rxu/ticket/13750Marc Alexander2015-05-081-7/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13750] Add core event to allow modifying navlinks text
| | * | | | | | | | [ticket/13750] Add core event to allow modifying navlinks textrxu2015-05-071-7/+33
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add generate_forum_nav() core event in includes/functions_display.php to allow modifying navlinks text. Use case example: extension(s) implementing multilanguage boards including translated forum names and so on. PHPBB3-13750
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-4/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
| | * | | | | | | [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | | | | | [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664