aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5103 from JoshyPHP/ticket/15531Marc Alexander2018-01-251-13/+30
|\
| * [ticket/15531] Workaround for false-positive sniffJoshyPHP2018-01-221-2/+1
| * [ticket/15531] Log malformed BBCodesJoshyPHP2018-01-221-13/+31
* | Merge pull request #5102 from JoshyPHP/ticket/15527Marc Alexander2018-01-242-10/+22
|\ \
| * | [ticket/15527] Remove "use" and specify full class name for exceptionMarc Alexander2018-01-241-3/+1
| * | [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migrationJoshyPHP2018-01-222-10/+24
| |/
* | [ticket/15526] Cast bbcode id to INT in merge bbcodes migrationMatt Friedman2018-01-201-2/+2
|/
* Merge pull request #5083 from JoshyPHP/ticket/15512Marc Alexander2018-01-191-1/+1
|\
| * [ticket/15512] Avoid reparsing non-existent pollsJoshyPHP2018-01-121-1/+1
* | [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJSJakub Senko2018-01-171-2/+2
|/
* [ticket/15502] Fix migrationsrxu2018-01-092-3/+7
* [prep-release-3.2.2] Add 3.1.12 to build and fix display of download boxMarc Alexander2018-01-072-5/+6
* [prep-release-3.2.2] Add migration for 3.2.2Marc Alexander2018-01-071-0/+37
* 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 downloadMarc Alexander2018-01-062-4/+4
* | Merge pull request #5076 from marc1706/ticket/15496Marc Alexander2018-01-071-1/+1
|\ \
| * | [ticket/15496] Add sort key to SELECT in fulltext_postgresMarc Alexander2018-01-061-1/+1
| |/
* | Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2Marc Alexander2018-01-0777-308/+359
|\ \
| * \ Merge pull request #4680 from marc1706/ticket/15055Derky2018-01-054-22/+82
| |\ \
| | * | [ticket/15055] Properly support index length check on mssqlMarc Alexander2018-01-012-6/+29
| | * | [ticket/15055] Specify utf8 as character set in sqlsrv_connectMarc Alexander2018-01-011-1/+2
| | * | [ticket/15055] Try using build matrixMarc Alexander2018-01-011-1/+1
| | * | [ticket/15055] Only drop dependent PK indexes and fix more tests for mssqlMarc Alexander2018-01-011-1/+2
| | * | [ticket/15055] Drop primary keys when necessary and fix test comparisonsMarc Alexander2018-01-011-0/+35
| | * | [ticket/15055] Use unicode column types where necessaryMarc Alexander2018-01-011-14/+14
| | |/
| * | [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-0171-215/+215
| * | [ticket/14972] Fix template context use of sizeof()Marc Alexander2018-01-011-46/+33
| * | [ticket/14972] Fix create_insert_array() declaration in admin_activate_userrxu2018-01-011-1/+1
| * | [ticket/14972] Fix use of deprecated media attachment constantsrxu2018-01-011-3/+10
| * | [ticket/14972] Fix sizeof callsrxu2018-01-012-21/+18
| |/
* | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-r...Marc Alexander2018-01-073-2/+37
|\ \
| * | [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-311-1/+14
| |\ \
| | * | [ticket/security/211] Allow make_clickable() again after change to regexMarc Alexander2017-08-032-2/+1
| * | | [ticket/15303] Correctly refer to $memcached and not $memcacheabyssmedia2017-12-311-1/+1
* | | | Merge branch 'ticket/security/211' into ticket/security/211-rheaMarc Alexander2018-01-012-2/+16
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | [ticket/security/211] Only run make_clickable() on URL type profile fieldsMarc Alexander2017-07-232-1/+15
| * | [ticket/security/211] Make sure website URL only uses http & https schemesMarc Alexander2017-07-221-1/+1
* | | [prep-release-3.2.2] Add migration for 3.2.2-RC1Marc Alexander2017-12-282-0/+41
* | | Merge pull request #4971 from Elsensee/ticket/15339Marc Alexander2017-12-2810-141/+221
|\ \ \
| * | | [ticket/15339] Fix testsOliver Schramm2017-12-241-1/+1
| * | | [ticket/15339] Free sql results in migration module toolOliver Schramm2017-11-171-2/+4
| * | | [ticket/15339] Allow a module to have multiple parentsOliver Schramm2017-11-173-123/+136
| * | | [ticket/15339] Use manual method when adding modulesOliver Schramm2017-09-229-18/+83
* | | | Merge pull request #5061 from marc1706/ticket/15322Derky2017-12-271-0/+37
|\ \ \ \
| * | | | [ticket/15322] Try to make new email setting more readableMarc Alexander2017-12-131-3/+3
| * | | | [ticket/15322] Add config setting for -f parameter & remove mail function nameMarc Alexander2017-12-111-0/+37
* | | | | Merge pull request #5037 from hubaishan/ticket/14857Marc Alexander2017-12-271-0/+6
|\ \ \ \ \
| * | | | | [ticket/14857] Throw `S` from dateformat for non English languageshubaishan2017-12-241-0/+6
* | | | | | Merge pull request #5038 from JoshyPHP/ticket/15444Marc Alexander2017-12-271-0/+75
|\ \ \ \ \ \