Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5083 from JoshyPHP/ticket/15512 | Marc Alexander | 2018-01-19 | 2 | -1/+12 |
|\ | | | | | | | [ticket/15512] Avoid reparsing non-existent polls | ||||
| * | [ticket/15512] Avoid reparsing non-existent polls | JoshyPHP | 2018-01-12 | 2 | -1/+12 |
| | | | | | | | | PHPBB3-15512 | ||||
* | | Merge pull request #5095 from senky/ticket/15099 | Marc Alexander | 2018-01-17 | 3 | -22/+22 |
|\ \ | | | | | | | | | | [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS | ||||
| * | | [ticket/15099] Fix tests | Jakub Senko | 2018-01-17 | 2 | -20/+20 |
| | | | | | | | | | | | | PHPBB3-15099 | ||||
| * | | [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS | Jakub Senko | 2018-01-17 | 1 | -2/+2 |
|/ / | | | | | | | PHPBB3-15099 | ||||
* | | Merge pull request #5071 from dsinn/ticket/15495 | Marc Alexander | 2018-01-16 | 1 | -0/+4 |
|\ \ | |/ |/| | | | [ticket/15495] Use transaction in ACP move_forum | ||||
| * | [ticket/15495] Use transaction in ACP move_forum | Daniel Sinn | 2018-01-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | Should prevent the forums table from getting messed up if an error or concurrent execution happens. PHPBB3-15495 | ||||
* | | Merge pull request #5079 from rxu/ticket/15502 | Derky | 2018-01-12 | 2 | -3/+7 |
|\ \ | | | | | | | | | | [ticket/15502] Fix migrations | ||||
| * | | [ticket/15502] Fix migrations | rxu | 2018-01-09 | 2 | -3/+7 |
| | | | | | | | | | | | | PHPBB3-15502 | ||||
* | | | Merge pull request #5082 from marc1706/ticket/15506 | Derky | 2018-01-11 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | [ticket/15506] Assign attachrow_template_vars before foreach | ||||
| * | | | [ticket/15506] Assign attachrow_template_vars before foreach | Marc Alexander | 2018-01-11 | 1 | -1/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | The attachrow_template_vars array needs to be defined once in front of the foreach instead of resetting the array on every iteration of the foreach. PHPBB3-15506 | ||||
* | | | Merge pull request #5072 from Derky/ticket/15499 | Marc Alexander | 2018-01-11 | 3 | -37/+21 |
|\ \ \ | | | | | | | | | | | | | [ticket/15499] Remove HHVM from Travis build matrix | ||||
| * | | | [ticket/15499] Remove HHVM from Travis build matrix | Derky | 2018-01-06 | 3 | -37/+21 |
| | | | | | | | | | | | | | | | | PHPBB3-15499 | ||||
* | | | | Merge pull request #5080 from marc1706/ticket/15055 | Derky | 2018-01-11 | 2 | -11/+20 |
|\ \ \ \ | |_|/ / |/| | | | | | | | [ticket/15055] Display content on unexpted server error | ||||
| * | | | [ticket/15055] Use regex to copy php to tools php | Marc Alexander | 2018-01-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | [ticket/15055] Specifiy PHP 7.1.12 and use development ini | Marc Alexander | 2018-01-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHP 7.1.13 seems to randomly fail. Use 7.1.12 for now. PHPBB3-15055 | ||||
| * | | | [ticket/15055] Run sql2016 builds with PHP 7.1 | Marc Alexander | 2018-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | [ticket/15055] Fix line break and disable sql server 2017 for now | Marc Alexander | 2018-01-09 | 2 | -12/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL Server 2017 currently fails for unknown reasons and just results in an overall longer build time. Therefore disabling it for now. PHPBB3-15055 | ||||
| * | | | [ticket/15055] Display content on unexpted server error | Marc Alexander | 2018-01-08 | 2 | -10/+15 |
|/ / / | | | | | | | | | | PHPBB3-15055 | ||||
* | | | [3.2.x] Update versions to 3.2.3-dev | Marc Alexander | 2018-01-07 | 3 | -5/+5 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2018-01-07 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'prep-release-3.1.12' into 3.1.x | Marc Alexander | 2018-01-07 | 1 | -0/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'prep-release-3.1.12' into 3.1.x | Marc Alexander | 2017-12-31 | 16 | -14/+203 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'prep-release-3.2.2' into 3.2.x | Marc Alexander | 2018-01-07 | 17 | -17/+259 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | [prep-release-3.2.2] Add 3.1.12 to build and fix display of download box | Marc Alexander | 2018-01-07 | 3 | -6/+7 |
| | | | | | | |||||
| * | | | | | Merge branch 'prep-release-3.1.12' into prep-release-3.2.2 | Marc Alexander | 2018-01-07 | 1 | -0/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | [prep-release-3.1.12] Update changelog | Marc Alexander | 2018-01-07 | 1 | -0/+4 |
| | | |/ / | | |/| | | |||||
| * | | | | [prep-release-3.2.2] Add migration for 3.2.2 | Marc Alexander | 2018-01-07 | 1 | -0/+37 |
| | | | | | |||||
| * | | | | [prep-release-3.2.2] Update changelog for 3.2.2 release | Marc Alexander | 2018-01-07 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Merge pull request #5077 from marc1706/ticket/15353 | Marc Alexander | 2018-01-07 | 2 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/15353] Do not use empty to not offer empty archive for download | ||||
| | * | | | | [ticket/15353] Do not use empty to not offer empty archive for download | Marc Alexander | 2018-01-06 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15353 | ||||
| * | | | | | Merge pull request #5076 from marc1706/ticket/15496 | Marc Alexander | 2018-01-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15496] Add sort key to SELECT in fulltext_postgres | ||||
| | * | | | | | [ticket/15496] Add sort key to SELECT in fulltext_postgres | Marc Alexander | 2018-01-06 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres requires that the column being ordered also appears in the SELECT part of the query. PHPBB3-15496 | ||||
| * | | | | | Merge pull request #5075 from marc1706/ticket/15497 | Marc Alexander | 2018-01-07 | 0 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15497] Backport fix for create_insert_array() declaration in admin_activate_user | ||||
| | * | | | | | [ticket/14972] Fix create_insert_array() declaration in admin_activate_user | rxu | 2018-01-06 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | PHPBB3-14972 | ||||
| * | | | | | Merge pull request #5074 from marc1706/ticket/15498 | Marc Alexander | 2018-01-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15498] Do not pass whether URL uses router to is_route | ||||
| | * | | | | | [ticket/15498] Do not pass whether URL uses router to is_route | Marc Alexander | 2018-01-06 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_route expects a flag of whether this is a route that was generated with the router as opposed to is_router_used() which returns whether the router will be used via app.php. PHPBB3-15498 | ||||
| * | | | | | Merge pull request #5068 from Derky/ticket/15489 | Marc Alexander | 2018-01-07 | 2 | -2/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15489] Remove NO_FORUMS message for categories with subforums | ||||
| | * | | | | | [ticket/15489] Add NO_FORUMS_IN_CATEGORY message | Derky | 2018-01-04 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15489 | ||||
| | * | | | | | [ticket/15489] Remove NO_FORUMS message for categories with subforums | Derky | 2017-12-31 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | PHPBB3-15489 | ||||
| * | | | | | Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 | Marc Alexander | 2018-01-07 | 197 | -1201/+1589 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4680 from marc1706/ticket/15055 | Derky | 2018-01-05 | 25 | -44/+439 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15055] Add appveyor file to allow running tests on appveyor as well | ||||
| * | | | | | | [ticket/15055] Display appveyor badges in readme | Marc Alexander | 2018-01-05 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Use getMock() for phpBB 3.2 compatibility | Marc Alexander | 2018-01-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Add comments explaining overriden createXMLDataSet() | Marc Alexander | 2018-01-01 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Properly support index length check on mssql | Marc Alexander | 2018-01-01 | 3 | -13/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Run phantomjs for UI tests | Marc Alexander | 2018-01-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Support console questions on windows | Marc Alexander | 2018-01-01 | 4 | -15/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Extend build matrix and trim text in extension_acp_test | Marc Alexander | 2018-01-01 | 2 | -45/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| * | | | | | | [ticket/15055] Run also on PHP 7.0 | Marc Alexander | 2018-01-01 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15055 |