aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/16112-3.3.x' into ticket/16112-masterMarc Alexander2019-07-291-1/+1
|\
| * Merge branch 'ticket/16112' into ticket/16112-3.3.xMarc Alexander2019-07-281-1/+1
| |\
| | * [ticket/16112] Update composer dependencies for 3.2.xMarc Alexander2019-07-281-1/+1
* | | Merge branch '3.3.x'Marc Alexander2019-06-031-1/+1
|\| |
| * | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-311-1/+1
| * | [ticket/16052] Update version numbers to 3.3Marc Alexander2019-05-111-1/+1
| * | [ticket/14948] Require json extension in composer.jsonMarc Alexander2019-05-091-0/+1
| * | [ticket/14948] Require PHP 7.1 and update dependenciesMarc Alexander2019-05-091-29/+29
| * | [ticket/15508] Update composer dependencies to allow Twig 2.xFrançois-Xavier de Guillebon2019-05-091-1/+1
| * | [ticket/15686] Update homesteadRubén Calvo2019-05-081-1/+1
| * | [ticket/14972] Bump PHP requirements to 5.6. Update dependencies.rxu2019-05-081-4/+4
| * | [ticket/15153] Update to newer homestead for vagrantMatt Friedman2019-05-061-1/+1
| * | [ticket/14670] Use symfony 3.1 in master branchMarc Alexander2019-05-061-29/+28
| |/
* | [ticket/14948] Require json extension in composer.jsonMarc Alexander2019-01-021-0/+1
* | [ticket/14948] Require PHP 7.1 and update dependenciesMarc Alexander2019-01-021-25/+25
* | Merge branch '3.2.x'chita2018-12-291-1/+1
|\|
| * [ticket/15921] Updated dependencies to latest textformatterJoshyPHP2018-12-261-1/+1
* | Merge pull request #5090 from deguif/twig-2Marc Alexander2018-12-251-1/+1
|\ \
| * | [ticket/15508] Update composer dependencies to allow Twig 2.xFrançois-Xavier de Guillebon2018-01-161-1/+1
* | | [ticket/15686] Update homesteadRubén Calvo2018-06-081-1/+1
* | | Merge pull request #4966 from VSEphpbb/ticket/15369Marc Alexander2018-02-171-1/+1
|\ \ \
| * | | [ticket/15369] Update composer to 1.6.xMatt Friedman2018-01-061-1/+1
| * | | [ticket/15369] Update composer to 1.5Matt Friedman2018-01-021-1/+1
| |/ /
* | | Merge branch '3.2.x'Marc Alexander2018-01-241-1/+1
|\ \ \ | |/ / |/| / | |/
| * [ticket/15525] Update to valid SPDX license name GPL-2.0-onlyMatt Friedman2018-01-201-1/+1
* | Merge branch '3.2.x'Marc Alexander2017-12-271-1/+1
|\|
| * [ticket/15457] Updated s9e/text-formatter dependencyJoshyPHP2017-12-101-2/+2
* | [ticket/15357] Requires composer/installers in phpBB core for extensionsTristan Darricau2017-09-101-0/+1
* | Merge branch '3.2.x'Tristan Darricau2017-08-061-1/+1
|\|
| * [ticket/15304] Update s9e/text-formatter dependencyJoshyPHP2017-08-051-1/+1
* | [ticket/14972] Bump PHP requirements to 5.6. Update dependencies.rxu2017-07-171-4/+4
* | Merge branch '3.2.x'Marc Alexander2017-07-161-1/+1
|\|
| * [ticket/15261] Fix censoring HTML tagsJoshyPHP2017-07-031-1/+1
* | Merge branch '3.2.x'Marc Alexander2017-06-111-1/+1
|\|
| * Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-311-1/+1
| |\
| | * [ticket/15178] Update dependencies for 3.1.xMarc Alexander2017-04-171-1/+1
| | * [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-091-0/+5
* | | [ticket/11150] Updates deps + fix various issuesTristan Darricau2017-04-231-2/+2
* | | [ticket/11150] Add ability to manage extensions through composerTristan Darricau2017-04-231-1/+2
* | | [ticket/15153] Update to newer homestead for vagrantMatt Friedman2017-03-261-1/+1
* | | Merge branch '3.2.x'Marc Alexander2017-01-151-1/+1
|\| |
| * | [ticket/15016] Fixed an issue with some parentheses in smiliesJoshyPHP2017-01-151-1/+1
* | | Merge branch '3.2.x'Marc Alexander2017-01-021-1/+1
|\| |
| * | [ticket/14947] Updates phpunit to 4.8Tristan Darricau2016-12-301-1/+1
* | | Merge branch '3.2.x'Máté Bartus2016-12-091-1/+1
|\| |
| * | [ticket/14891] Use own proxy instantiator for open_basedir compatibilityMarc Alexander2016-12-091-1/+1
* | | Merge branch '3.2.x'Marc Alexander2016-12-061-1/+1
|\| |
| * | [ticket/14892] Revert to twig 1.24 to have working assets againMarc Alexander2016-12-061-1/+1
* | | Merge branch '3.2.x'Tristan Darricau2016-11-241-1/+1
|\| |
| * | [ticket/14867] Revert back to twig 1.26.* and update dependenciesMarc Alexander2016-11-161-1/+1