Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/15010] Fix incorrect use of request | Richard McGirr | 2017-01-14 | 1 | -1/+1 |
| | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15010 PHPBB3-15010 | ||||
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-14 | 3 | -3/+3 |
|\ | |||||
| * | [ticket/15003] Do not check disabled checkboxes with marklist function | Matt Friedman | 2017-01-13 | 5 | -5/+5 |
| | | | | | | | | PHPBB3-15003 | ||||
* | | Merge pull request #4625 from Nicofuma/ticket/14973 | Marc Alexander | 2017-01-08 | 1 | -0/+21 |
|\ \ | | | | | | | | | | [ticket/14973] Add BC layer for \phpbb\db\tools | ||||
| * | | [ticket/14973] Add BC layer for \phpbb\db\tools | Tristan Darricau | 2017-01-08 | 1 | -0/+21 |
| | | | | | | | | | | | | PHPBB3-14973 | ||||
* | | | Merge pull request #4623 from rxu/ticket/14971 | Tristan Darricau | 2017-01-08 | 1 | -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.1 | rxu | 2017-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14971 | ||||
* | | | [ticket/14967] Add cookie notice migration fixing invalid previous one | Marc Alexander | 2017-01-08 | 1 | -0/+36 |
|/ / | | | | | | | PHPBB3-14967 | ||||
* | | [3.2.x] Update development version to 3.2.1-dev | Marc Alexander | 2017-01-07 | 2 | -2/+2 |
| | | |||||
* | | [prep-release-3.2.0] Fix links to convertor | Marc Alexander | 2017-01-07 | 1 | -7/+7 |
| | | |||||
* | | [prep-release-3.2.0] Correctly compare extensions version | Marc Alexander | 2017-01-07 | 2 | -2/+2 |
| | | |||||
* | | [prep-release-3.2.0] Update version numbers and add 3.2.0 migration | Marc Alexander | 2017-01-07 | 6 | -6/+46 |
| | | |||||
* | | Merge pull request #4618 from marc1706/ticket/14961 | Marc Alexander | 2017-01-07 | 10 | -3/+74 |
|\ \ | | | | | | | | | | [ticket/14961] Add cookie notice as enablable feature | ||||
| * | | [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2 | Marc Alexander | 2017-01-06 | 1 | -3/+2 |
| | | | | | | | | | | | | PHPBB3-14961 | ||||
| * | | [ticket/14961] Also translate "learn more" link | Marc Alexander | 2017-01-06 | 2 | -1/+3 |
| | | | | | | | | | | | | PHPBB3-14961 | ||||
| * | | [ticket/14961] Add cookie notice as enablable feature | Marc Alexander | 2017-01-06 | 9 | -0/+70 |
| | | | | | | | | | | | | | | | | | | | | | Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961 | ||||
* | | | Merge pull request #4620 from marc1706/ticket/14772 | Marc Alexander | 2017-01-07 | 3 | -4/+14 |
|\ \ \ | | | | | | | | | | | | | [ticket/14772] Use float to prevent pagination overwriting topic time | ||||
| * | | | [ticket/14772] Add rtl definition for .topic-poster and small margin | Marc Alexander | 2017-01-06 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-14772 | ||||
| * | | | [ticket/14772] Use float to prevent pagination overwriting topic time | Marc Alexander | 2017-01-06 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | PHPBB3-14772 | ||||
* | | | | Merge pull request #4619 from Nicofuma/ticket/14962 | Marc Alexander | 2017-01-07 | 3 | -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 texts | Tristan Darricau | 2017-01-06 | 3 | -8/+30 |
| | | | | | | | | | | | | | | | | PHPBB3-14962 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-06 | 1 | -2/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #4613 from rxu/ticket/14958 | Marc Alexander | 2017-01-06 | 1 | -2/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | [ticket/14958] Optimize Twig extension lang() function | ||||
| | * | | | [ticket/14958] Optimize Twig extension lang() function | rxu | 2017-01-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14958 | ||||
* | | | | | Merge pull request #4617 from marc1706/ticket/14949 | Marc Alexander | 2017-01-06 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14949] Pass full notification array and post data for updating | ||||
| * | | | | | [ticket/14949] Pass full notification array and post data for updating | Marc Alexander | 2017-01-05 | 1 | -1/+7 |
| | |_|_|/ | |/| | | | | | | | | | | | | | PHPBB3-14949 | ||||
* | | | | | Merge pull request #4608 from marc1706/ticket/14954 | Marc Alexander | 2017-01-06 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queue | ||||
| * | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queue | Marc Alexander | 2017-01-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14954 | ||||
* | | | | | | Merge pull request #4615 from marc1706/ticket/14946 | Marc Alexander | 2017-01-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14946] Make sure to pass integers to max() | ||||
| * | | | | | | [ticket/14946] Make sure to pass integers to max() | Marc Alexander | 2017-01-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14946 | ||||
* | | | | | | | Merge pull request #4616 from marc1706/ticket/14945 | Marc Alexander | 2017-01-06 | 1 | -7/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | [ticket/14945] Parse signature preview with generate_text_for_display() | ||||
| * | | | | | | [ticket/14945] Parse signature preview with generate_text_for_display() | Marc Alexander | 2017-01-04 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945 | ||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #4532 from senky/ticket/14662 | Marc Alexander | 2017-01-04 | 3 | -2/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14662] Add memberlist_team_username_prepend/append | ||||
| | * | | | | | [ticket/14662] Add memberlist_team_username_prepend/append | Jakub Senko | 2016-12-18 | 3 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14662 | ||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge pull request #4600 from hubaishan/ticket/14549 | Marc Alexander | 2017-01-04 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14549] fix mcp page redirect back after topic merge and rised warning | ||||
| | * | | | | | [ticket/14549] Correcting $redirect var to avoid the bug | hubaishan | 2016-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549 | ||||
* | | | | | | | Merge pull request #4443 from Crizz0/ticket/14780 | Marc Alexander | 2017-01-04 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14780] Correction to let group setting overwrite global PM setting | ||||
| * | | | | | | | [ticket/14780] Only use $max_setting in this function | Crizzo | 2016-09-15 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780 | ||||
| * | | | | | | | [ticket/14780] Correct if sentence to let group setting overwrite global | Crizzo | 2016-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780 | ||||
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 1 | -9/+16 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4595 from DavidIQ/ticket/14941 | Marc Alexander | 2017-01-04 | 1 | -9/+16 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | [ticket/14941] Apply changes individually for MySQL fulltext search | ||||
| | * | | | | | | [ticket/14941] Apply changes individually for MySQL fulltext search | David Colón | 2016-12-27 | 1 | -9/+16 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4599 from VSEphpbb/ticket/14945 | Marc Alexander | 2017-01-04 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14945] Fix bbcode flags in user sig previews | ||||
| * | | | | | | | | [ticket/14945] Send bbcode flags in user sig previews | Matt Friedman | 2016-12-28 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945 | ||||
* | | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 8 | -11/+36 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #4611 from marc1706/ticket/14838 | Marc Alexander | 2017-01-04 | 8 | -11/+36 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [icket/14838] Do not query full attachments table in feeds | ||||
| | * | | | | | | | | [ticket/14838] Remove obsolete overriding method | Marc Alexander | 2017-01-04 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14838 | ||||
| | * | | | | | | | | [ticket/14838] Do not query full attachments table in feeds | Marc Alexander | 2017-01-03 | 8 | -3/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838 |