aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #5097 from canonknipser/ticket/15513Marc Alexander2018-01-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | [ticket/15513] Signature edit in acp gives error
| * | | | | | | | [ticket/15513] Signature edit in acp gives errorcanonknipser2018-01-201-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When editing a users signature in acp, a error is thrown. PHPBB3-15513
* | | | | | | | [ticket/15523] Fix AdBlocker causing JS error when using CookieConsentkasimi2018-01-191-16/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-15523
* | | | | | | Merge pull request #5083 from JoshyPHP/ticket/15512Marc Alexander2018-01-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15512] Avoid reparsing non-existent polls
| * | | | | | | [ticket/15512] Avoid reparsing non-existent pollsJoshyPHP2018-01-121-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-15512
* | | | | | | [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJSJakub Senko2018-01-171-2/+2
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | PHPBB3-15099
* | | | | | Merge pull request #5071 from dsinn/ticket/15495Marc Alexander2018-01-161-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/15495] Use transaction in ACP move_forum
| * | | | | [ticket/15495] Use transaction in ACP move_forumDaniel Sinn2018-01-031-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/15502Derky2018-01-122-3/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15502] Fix migrations
| * | | | | [ticket/15502] Fix migrationsrxu2018-01-092-3/+7
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-15502
* | | | | [ticket/15506] Assign attachrow_template_vars before foreachMarc Alexander2018-01-111-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
* | | | [3.2.x] Update versions to 3.2.3-devMarc Alexander2018-01-072-2/+2
| | | |
* | | | [prep-release-3.2.2] Add 3.1.12 to build and fix display of download boxMarc Alexander2018-01-072-5/+6
| | | |
* | | | Merge branch 'prep-release-3.1.12' into prep-release-3.2.2Marc Alexander2018-01-071-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | [prep-release-3.1.12] Update changelogMarc Alexander2018-01-071-0/+4
| | | |
* | | | [prep-release-3.2.2] Add migration for 3.2.2Marc Alexander2018-01-071-0/+37
| | | |
* | | | [prep-release-3.2.2] Update changelog for 3.2.2 releaseMarc Alexander2018-01-071-0/+8
| | | |
* | | | Merge pull request #5077 from marc1706/ticket/15353Marc Alexander2018-01-072-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 downloadMarc Alexander2018-01-062-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-15353
* | | | | 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