aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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 #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-07157-1140/+1191
|\ \ \
| * \ \ Merge pull request #4680 from marc1706/ticket/15055Derky2018-01-055-23/+83
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15055] Add appveyor file to allow running tests on appveyor as well
| | * | | [ticket/15055] Properly support index length check on mssqlMarc Alexander2018-01-012-6/+29
| | | | | | | | | | | | | | | | | | | | 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-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Only drop dependent PK indexes and fix more tests for mssqlMarc Alexander2018-01-011-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Drop primary keys when necessary and fix test comparisonsMarc Alexander2018-01-011-0/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Use unicode column types where necessaryMarc Alexander2018-01-011-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-15055
| | * | | [ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibilityMarc Alexander2018-01-011-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-15055
| * | | [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-01149-951/+951
| | | | | | | | | | | | | | | | PHPBB3-14972
| * | | [ticket/14972] Fix template context use of sizeof()Marc Alexander2018-01-011-46/+33
| | | | | | | | | | | | | | | | 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-076-4/+83
|\ \ \ | | | | | | | | | | | | 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-314-5/+23
| |\ \ \ | | | | | | | | | | | | | | | [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-032-2/+1
| | | | | | | | | | | | | | | | | | | | SECURITY-211
| * | | | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-312-2/+2
| | | | |
| * | | | [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 branch 'ticket/security/211' into ticket/security/211-rheaMarc Alexander2018-01-015-6/+25
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | [ticket/security/211] Do not match javascript URIs with URL regexesMarc Alexander2017-07-262-3/+3
| | | | | | | | | | | | | | | | SECURITY-211
| * | | [ticket/security/211] Only run make_clickable() on URL type profile fieldsMarc Alexander2017-07-232-1/+15
| | | | | | | | | | | | | | | | SECURITY-211
| * | | [ticket/security/211] Make sure website URL only uses http & https schemesMarc Alexander2017-07-223-2/+7
| | | | | | | | | | | | | | | | SECURITY-211
* | | | [3.2.x] Update version number to 3.2.3-devMarc Alexander2017-12-282-2/+2
| |_|/ |/| |
* | | [prep-release-3.2.2] Update changelog for 3.2.2-RC1Marc Alexander2017-12-281-0/+132
| | |
* | | [prep-release-3.2.2] Add migration for 3.2.2-RC1Marc Alexander2017-12-282-0/+41
| | |
* | | [prep-release-3.2.2] Update version to 3.2.2Marc Alexander2017-12-282-3/+3
| | |
* | | [prep-release-3.2.2] Update version to 3.2.2-RC1Marc Alexander2017-12-283-3/+3
| | |
* | | [ticket/15179] Update dependencies for 3.2.xMarc Alexander2017-12-281-102/+103
| | | | | | | | | | | | PHPBB3-15179
* | | Merge pull request #4971 from Elsensee/ticket/15339Marc Alexander2017-12-2810-141/+221
|\ \ \ | | | | | | | | | | | | [ticket/15339] Use manual method when adding modules
| * | | [ticket/15339] Fix testsOliver Schramm2017-12-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15339
| * | | [ticket/15339] Free sql results in migration module toolOliver Schramm2017-11-171-2/+4
| | | | | | | | | | | | | | | | PHPBB3-15339
| * | | [ticket/15339] Allow a module to have multiple parentsOliver Schramm2017-11-173-123/+136
| | | | | | | | | | | | | | | | | | | | | | | | Also restore old behaviour from Olympus regarding re-sorting modules PHPBB3-15339
| * | | [ticket/15339] Use manual method when adding modulesOliver Schramm2017-09-229-18/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix cases where the module is deleted in later versions and the migrator thus cannot retrieve the info. PHPBB3-15339
* | | | Merge pull request #5045 from senky/ticket/15454Marc Alexander2017-12-281-2/+30
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15454] Add core.mcp_queue_approve_details_template
| * | | | [ticket/15454] Add post template data to eventMarc Alexander2017-12-281-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15454
| * | | | [ticket/15454] Add core.mcp_queue_approve_details_templateJakub Senko2017-11-131-2/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-15454
* | | | | Merge pull request #5044 from hubaishan/ticket/15453Marc Alexander2017-12-281-2/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15453] Add core event after language deleted in acp_language.php
| * | | | | [ticket/15453] Add core event after language deleted in acp_language.phphubaishan2017-12-271-2/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add core event after language deleted in acp_language.php PHPBB3-15453
* | | | | Merge pull request #5063 from vinny/ticket/15485Marc Alexander2017-12-282-1/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15485] Add template event for forum images