Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | rxu | 2017-01-05 | 1 | -2/+1 |
* | | | 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 | Marc Alexander | 2017-01-05 | 1 | -1/+7 |
* | | | | 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 | Marc Alexander | 2017-01-02 | 2 | -2/+2 |
* | | | | | 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() | Marc Alexander | 2017-01-04 | 1 | -1/+1 |
* | | | | | | 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() | Marc Alexander | 2017-01-04 | 1 | -7/+2 |
* | | | | | | 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 | Jakub Senko | 2016-12-18 | 3 | -2/+18 |
* | | | | | | 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] Correcting $redirect var to avoid the bug | hubaishan | 2016-12-29 | 1 | -1/+1 |
* | | | | | | Merge pull request #4443 from Crizz0/ticket/14780 | Marc Alexander | 2017-01-04 | 2 | -5/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/14780] Only use $max_setting in this function | Crizzo | 2016-09-15 | 1 | -3/+2 |
| * | | | | | | [ticket/14780] Fixes array with exspected results in test-function | Crizzo | 2016-09-15 | 1 | -2/+2 |
| * | | | | | | [ticket/14780] Correct if sentence to let group setting overwrite global | Crizzo | 2016-09-12 | 1 | -1/+1 |
* | | | | | | | 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 | David Colón | 2016-12-27 | 1 | -9/+16 |
* | | | | | | | Merge pull request #4614 from marc1706/ticket/14838 | Marc Alexander | 2017-01-04 | 2 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/14838] Correctly instantiate language object | Marc Alexander | 2017-01-04 | 1 | -1/+6 |
| * | | | | | | | [ticket/14838] Add missing method to mock'ed feed | Marc Alexander | 2017-01-04 | 1 | -0/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4599 from VSEphpbb/ticket/14945 | Marc Alexander | 2017-01-04 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/14945] Send bbcode flags in user sig previews | Matt Friedman | 2016-12-28 | 2 | -2/+6 |
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 10 | -11/+161 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4611 from marc1706/ticket/14838 | Marc Alexander | 2017-01-04 | 10 | -11/+161 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14838] Remove obsolete overriding method | Marc Alexander | 2017-01-04 | 1 | -8/+0 |
| | * | | | | | | | [ticket/14838] Add simple test for fetch_attachments method | Marc Alexander | 2017-01-03 | 2 | -0/+125 |
| | * | | | | | | | [ticket/14838] Do not query full attachments table in feeds | Marc Alexander | 2017-01-03 | 8 | -3/+36 |
* | | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #4609 from marc1706/ticket/14957 | Marc Alexander | 2017-01-04 | 6 | -10/+22 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4610 from marc1706/ticket/14957-rhea | Marc Alexander | 2017-01-04 | 10 | -10/+62 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | [ticket/14957] Make sure config_php_file is set before injecting | Marc Alexander | 2017-01-03 | 1 | -0/+5 |
| * | | | | | | | | Merge branch 'ticket/14957' into ticket/14957-rhea | Marc Alexander | 2017-01-03 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | [ticket/14957] Do not use method return in write context | Marc Alexander | 2017-01-03 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'ticket/14957' into ticket/14957-rhea | Marc Alexander | 2017-01-03 | 9 | -10/+55 |
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | _ / / / / / / | | / / / / / / | |||||
| * | | | | | | | [ticket/14957] Do not cache database config entries | Marc Alexander | 2017-01-03 | 6 | -10/+21 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4602 from Nicofuma/ticket/14947 | Marc Alexander | 2017-01-02 | 5 | -90/+306 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/14947] Create new webdriver instance for every test | Marc Alexander | 2017-01-02 | 3 | -44/+46 |
| * | | | | | | | [ticket/14947] Updates phpunit to 4.8 | Tristan Darricau | 2016-12-30 | 2 | -46/+260 |
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2017-01-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| * | | | | | | Merge pull request #4607 from marc1706/ticket/14953 | Tristan Darricau | 2017-01-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query | Marc Alexander | 2017-01-02 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-12-30 | 2 | -0/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #4593 from javiexin/ticket/14940 | Tristan Darricau | 2016-12-30 | 2 | -0/+7 |
| |\ \ \ \ \ \ |