aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-051-7/+9
|\
| * Merge pull request #5615 from 3D-I/ticket/16073Marc Alexander2019-06-051-7/+9
| |\
| | * [ticket/16073] Fix warning in ACP version check3D-I2019-06-011-7/+9
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-043-9/+24
|\ \ \ | |/ /
| * | Merge pull request #5612 from senky/ticket/15932Marc Alexander2019-06-043-9/+24
| |\ \
| | * | [ticket/15932] Disallow deleting locked attachmentsJakub Senko2019-05-283-9/+24
| | |/
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-2/+0
|\ \ \ | |/ /
| * | Merge pull request #5607 from senky/ticket/15974Marc Alexander2019-06-031-2/+0
| |\ \
| | * | [ticket/15974] Remove Back to previous page linkJakub Senko2019-05-271-2/+0
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-1/+5
|\ \ \ \ | |/ / /
| * | | [ticket/16071] Undefined index for custom attachments groups3D-I2019-05-291-1/+5
| | |/ | |/|
| * | Merge pull request #5592 from 3D-I/ticket/16055Marc Alexander2019-05-271-1/+1
| |\ \
| | * | [ticket/16055] Fix Oauth's redirects3D-I2019-05-161-1/+1
* | | | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-313-18/+57
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-271-8/+10
|\ \ \ \ | |/ / /
| * | | [ticket/16053] Update s9e/text-formatterJoshyPHP2019-05-171-8/+10
| | |/ | |/|
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ | |/ /
| * | Merge pull request #5587 from 3D-I/ticket/16048Marc Alexander2019-05-141-1/+1
| |\ \
| | * | [ticket/16048] Fix restore backup from ACP3D-I2019-05-071-1/+1
| | |/
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ | |/ /
| * | [ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+rxu2019-05-111-1/+1
| |/
* | [ticket/16052] Update composer dependenciesMarc Alexander2019-05-121-806/+232
* | [ticket/16052] Add 3.3.0-dev migrationMarc Alexander2019-05-111-0/+36
* | [ticket/15927] Avoid using floatshanakin2019-05-111-6/+2
* | [ticket/15927] Fix render issuehanakin2019-05-112-9/+13
* | [ticket/16052] Update version numbers to 3.3Marc Alexander2019-05-1120-70/+70
* | [ticket/16052] Fix issues caused by mergesMarc Alexander2019-05-113-4/+3
* | [ticket/14948] Require json extension in composer.jsonMarc Alexander2019-05-092-2/+4
* | [ticket/14948] Use continue 2 instead of continue to continue while loopMarc Alexander2019-05-091-2/+2
* | [ticket/14948] Update lexer to be compatible with twig 2.6Marc Alexander2019-05-091-13/+3
* | [ticket/14948] Update requirements and travis build matrixMarc Alexander2019-05-098-19/+12
* | [ticket/14948] Adjust calls for twig and phpunit updatesMarc Alexander2019-05-092-2/+2
* | [ticket/14948] Require PHP 7.1 and update dependenciesMarc Alexander2019-05-092-493/+751
* | [ticket/15921] Fix master buildMáté Bartus2019-05-091-454/+609
* | [ticket/15508] Update loaderFrançois-Xavier de Guillebon2019-05-091-3/+3
* | [ticket/15508] Remove call to getEnvironment() from parserFrançois-Xavier de Guillebon2019-05-099-25/+64
* | [ticket/15508] Replace Twig_NodeInterface with Twig_NodeFrançois-Xavier de Guillebon2019-05-098-8/+8
* | [ticket/15508] Update composer dependencies to allow Twig 2.xFrançois-Xavier de Guillebon2019-05-092-523/+427
* | [ticket/12629] Rename errors_show to show_errorsrubencm2019-05-093-4/+4
* | [ticket/12629] Add debug.errors_showRubén Calvo2019-05-093-2/+5
* | [ticket/15846] Fix Wrong id for downldable grouphubaishan2019-05-091-5/+5
* | [ticket/15244] Remove unglobalise related codeRubén Calvo2019-05-093-23/+1
* | [ticket/12636] Rename log.session_errors to session.log_errorsrubencm2019-05-094-7/+7
* | [ticket/12636] Add log.session_errorsRubén Calvo2019-05-094-1/+16
* | [ticket/12628] Introduce debug.memoryJakub Senko2019-05-094-10/+18
* | [ticket/15410] Remove obsolete code from BBCodes ACPJoshyPHP2019-05-091-154/+5
* | [ticket/15772] Hide warning in acp when allow_install_dir is truerubencm2019-05-091-1/+1
* | [ticket/15255] Move language strings from acp/common to commonRubén Calvo2019-05-093-22/+23
* | [ticket/11838] OAuth registration from ucp_registerJakub Senko2019-05-094-1/+38
* | [ticket/15720] Don't escape ampersands on redirectionsRubén Calvo2019-05-093-5/+5