aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5076 from marc1706/ticket/15496Marc Alexander2018-01-071-1/+1
|\ | | | | | | [ticket/15496] Add sort key to SELECT in fulltext_postgres
| * [ticket/15496] Add sort key to SELECT in fulltext_postgresMarc Alexander2018-01-061-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/15497Marc Alexander2018-01-070-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_userrxu2018-01-061-1/+1
| |/ | | | | | | PHPBB3-14972
* | Merge pull request #5074 from marc1706/ticket/15498Marc Alexander2018-01-071-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_routeMarc Alexander2018-01-061-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/15489Marc Alexander2018-01-072-2/+3
|\ \ | | | | | | | | | [ticket/15489] Remove NO_FORUMS message for categories with subforums
| * | [ticket/15489] Add NO_FORUMS_IN_CATEGORY messageDerky2018-01-042-1/+2
| | | | | | | | | | | | PHPBB3-15489
| * | [ticket/15489] Remove NO_FORUMS message for categories with subforumsDerky2017-12-311-1/+1
| | | | | | | | | | | | PHPBB3-15489
* | | Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2Marc Alexander2018-01-07197-1201/+1589
|\ \ \
| * \ \ Merge pull request #4680 from marc1706/ticket/15055Derky2018-01-0525-44/+439
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15055] Add appveyor file to allow running tests on appveyor as well
| | * | | [ticket/15055] Display appveyor badges in readmeMarc Alexander2018-01-051-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Use getMock() for phpBB 3.2 compatibilityMarc Alexander2018-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Add comments explaining overriden createXMLDataSet()Marc Alexander2018-01-011-0/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Properly support index length check on mssqlMarc Alexander2018-01-013-13/+46
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Run phantomjs for UI testsMarc Alexander2018-01-011-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Support console questions on windowsMarc Alexander2018-01-014-15/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Extend build matrix and trim text in extension_acp_testMarc Alexander2018-01-012-45/+83
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Run also on PHP 7.0Marc Alexander2018-01-011-6/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Specify utf8 as character set in sqlsrv_connectMarc Alexander2018-01-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be able to correctly retrieve unicode data from the db. PHPBB3-15055
| | * | | [ticket/15055] Try using build matrixMarc Alexander2018-01-014-4/+42
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Only drop dependent PK indexes and fix more tests for mssqlMarc Alexander2018-01-0112-10/+57
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Handle default identity column on mssql in database testsMarc Alexander2018-01-011-0/+47
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Try moving to PHP 7.1Marc Alexander2018-01-011-6/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Drop primary keys when necessary and fix test comparisonsMarc Alexander2018-01-012-1/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Use unicode column types where necessaryMarc Alexander2018-01-011-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Start fixing missing keys in fixturesMarc Alexander2018-01-012-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Start setting up IISMarc Alexander2018-01-011-1/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibilityMarc Alexander2018-01-014-6/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Debug issuesMarc Alexander2018-01-012-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Output test config to test_config.phpMarc Alexander2018-01-011-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Add .appveyor.yml fileMarc Alexander2018-01-011-0/+39
| | |/ / | | | | | | | | | | | | PHPBB3-15055
| * | | Merge pull request #5069 from marc1706/ticket/14972-rheaDerky2018-01-04180-1157/+1150
| |\ \ \ | | |/ / | |/| | | | | | [ticket/14972] Backport for PHP 7.2 compatibility
| | * | [ticket/14972] Add PHP 7.2 to build matrixMarc Alexander2018-01-011-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-01165-983/+983
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] Fix template context use of sizeof()Marc Alexander2018-01-011-46/+33
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] Fix test_collection_with_mask testrxu2018-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In PHP 7.2, the severity of the message “Use of undefined constant” was raised from E_NOTICE to E_WARNING, so calling $array[ITEM] causes warning caught by error collector. Use undefined offset notice to get an empty message as such. PHPBB3-14972
| | * | [ticket/14972] Avoid using self as constant in testsrxu2018-01-016-6/+6
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] Fix create_insert_array() declaration in admin_activate_userrxu2018-01-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] Fix use of deprecated media attachment constantsrxu2018-01-011-3/+10
| | | | | | | | | | | | | | | | PHPBB3-14972
| | * | [ticket/14972] Fix sizeof callsrxu2018-01-015-116/+113
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | As of PHP 7.2, only arrays and objects implementing the Countable interface should be passed as a count() or sizeof() parameter. See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198 Also, sizeof() seems to be sheduled for deprecation, see https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations PHPBB3-14972
* | | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into ↵Marc Alexander2018-01-078-9/+88
|\ \ \ | | | | | | | | | | | | prep-release-3.2.2
| * | | [prep-release-3.1.12] Update changelog for 3.1.12Marc Alexander2017-12-311-0/+44
| | | |
| * | | [prep-release-3.1.12] Add migration for 3.1.12Marc Alexander2017-12-311-0/+36
| | | |
| * | | Merge pull request #40 from phpbb/ticket/security/211Marc Alexander2017-12-317-5/+114
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security/211] Make sure website URL only uses http & https schemes
| | * | | [ticket/security/211] Allow make_clickable() again after change to regexMarc Alexander2017-08-033-4/+3
| | | | | | | | | | | | | | | | | | | | SECURITY-211
| * | | | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-313-3/+3
| | | | |
| * | | | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-313-5/+5
| | | | |
| * | | | [ticket/15303] Correctly refer to $memcached and not $memcacheabyssmedia2017-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15303
* | | | | Merge pull request #41 from phpbb/ticket/security/211-rheaMarc Alexander2018-01-0711-13/+125
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | [ticket/security/211] Rhea version of security fix