aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15010] Fix incorrect use of requestRichard McGirr2017-01-141-1/+1
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-15010 PHPBB3-15010
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-143-3/+3
|\
| * [ticket/15003] Do not check disabled checkboxes with marklist functionMatt Friedman2017-01-135-5/+5
| | | | | | | | PHPBB3-15003
* | Merge pull request #4625 from Nicofuma/ticket/14973Marc Alexander2017-01-081-0/+21
|\ \ | | | | | | | | | [ticket/14973] Add BC layer for \phpbb\db\tools
| * | [ticket/14973] Add BC layer for \phpbb\db\toolsTristan Darricau2017-01-081-0/+21
| | | | | | | | | | | | PHPBB3-14973
* | | Merge pull request #4623 from rxu/ticket/14971Tristan Darricau2017-01-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | [ticket/14971] Fix pagination PHP warning on PHP 7.1 * rxu/ticket/14971: [ticket/14971] Add on_page test with the string arguments [ticket/14971] Fix pagination PHP warning on PHP 7.1
| * | [ticket/14971] Fix pagination PHP warning on PHP 7.1rxu2017-01-081-1/+1
| | | | | | | | | | | | PHPBB3-14971
* | | [ticket/14967] Add cookie notice migration fixing invalid previous oneMarc Alexander2017-01-081-0/+36
|/ / | | | | | | PHPBB3-14967
* | [3.2.x] Update development version to 3.2.1-devMarc Alexander2017-01-072-2/+2
| |
* | [prep-release-3.2.0] Fix links to convertorMarc Alexander2017-01-071-7/+7
| |
* | [prep-release-3.2.0] Correctly compare extensions versionMarc Alexander2017-01-072-2/+2
| |
* | [prep-release-3.2.0] Update version numbers and add 3.2.0 migrationMarc Alexander2017-01-076-6/+46
| |
* | Merge pull request #4618 from marc1706/ticket/14961Marc Alexander2017-01-0710-3/+74
|\ \ | | | | | | | | | [ticket/14961] Add cookie notice as enablable feature
| * | [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2Marc Alexander2017-01-061-3/+2
| | | | | | | | | | | | PHPBB3-14961
| * | [ticket/14961] Also translate "learn more" linkMarc Alexander2017-01-062-1/+3
| | | | | | | | | | | | PHPBB3-14961
| * | [ticket/14961] Add cookie notice as enablable featureMarc Alexander2017-01-069-0/+70
| | | | | | | | | | | | | | | | | | | | | Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961
* | | Merge pull request #4620 from marc1706/ticket/14772Marc Alexander2017-01-073-4/+14
|\ \ \ | | | | | | | | | | | | [ticket/14772] Use float to prevent pagination overwriting topic time
| * | | [ticket/14772] Add rtl definition for .topic-poster and small marginMarc Alexander2017-01-062-0/+6
| | | | | | | | | | | | | | | | PHPBB3-14772
| * | | [ticket/14772] Use float to prevent pagination overwriting topic timeMarc Alexander2017-01-062-4/+8
| | | | | | | | | | | | | | | | PHPBB3-14772
* | | | Merge pull request #4619 from Nicofuma/ticket/14962Marc Alexander2017-01-073-8/+30
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
| * | | [ticket/14962] Introduces a new helper to check emptyness of bbcode textsTristan Darricau2017-01-063-8/+30
| | | | | | | | | | | | | | | | PHPBB3-14962
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-061-2/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #4613 from rxu/ticket/14958Marc Alexander2017-01-061-2/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14958] Optimize Twig extension lang() function
| | * | | [ticket/14958] Optimize Twig extension lang() functionrxu2017-01-051-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14958
* | | | | Merge pull request #4617 from marc1706/ticket/14949Marc Alexander2017-01-061-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14949] Pass full notification array and post data for updating
| * | | | | [ticket/14949] Pass full notification array and post data for updatingMarc Alexander2017-01-051-1/+7
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-14949
* | | | | Merge pull request #4608 from marc1706/ticket/14954Marc Alexander2017-01-062-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queue
| * | | | | [ticket/14954] Properly check if topic has attachments in mcp_queueMarc Alexander2017-01-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14954
* | | | | | Merge pull request #4615 from marc1706/ticket/14946Marc Alexander2017-01-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14946] Make sure to pass integers to max()
| * | | | | | [ticket/14946] Make sure to pass integers to max()Marc Alexander2017-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14946
* | | | | | | Merge pull request #4616 from marc1706/ticket/14945Marc Alexander2017-01-061-7/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | [ticket/14945] Parse signature preview with generate_text_for_display()
| * | | | | | [ticket/14945] Parse signature preview with generate_text_for_display()Marc Alexander2017-01-041-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-042-1/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4532 from senky/ticket/14662Marc Alexander2017-01-043-2/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14662] Add memberlist_team_username_prepend/append
| | * | | | | [ticket/14662] Add memberlist_team_username_prepend/appendJakub Senko2016-12-183-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14662
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge pull request #4600 from hubaishan/ticket/14549Marc Alexander2017-01-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14549] fix mcp page redirect back after topic merge and rised warning
| | * | | | | [ticket/14549] Correcting $redirect var to avoid the bughubaishan2016-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549
* | | | | | | Merge pull request #4443 from Crizz0/ticket/14780Marc Alexander2017-01-041-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14780] Correction to let group setting overwrite global PM setting
| * | | | | | | [ticket/14780] Only use $max_setting in this functionCrizzo2016-09-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
| * | | | | | | [ticket/14780] Correct if sentence to let group setting overwrite globalCrizzo2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-9/+16
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4595 from DavidIQ/ticket/14941Marc Alexander2017-01-041-9/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | [ticket/14941] Apply changes individually for MySQL fulltext search
| | * | | | | | [ticket/14941] Apply changes individually for MySQL fulltext searchDavid Colón2016-12-271-9/+16
| | | | | | | |
* | | | | | | | Merge pull request #4599 from VSEphpbb/ticket/14945Marc Alexander2017-01-042-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14945] Fix bbcode flags in user sig previews
| * | | | | | | | [ticket/14945] Send bbcode flags in user sig previewsMatt Friedman2016-12-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-048-11/+36
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #4611 from marc1706/ticket/14838Marc Alexander2017-01-048-11/+36
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [icket/14838] Do not query full attachments table in feeds
| | * | | | | | | | [ticket/14838] Remove obsolete overriding methodMarc Alexander2017-01-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838
| | * | | | | | | | [ticket/14838] Do not query full attachments table in feedsMarc Alexander2017-01-038-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838