aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-301-4/+4
|\
| * Merge pull request #4597 from javiexin/ticket/14943Tristan Darricau2016-12-301-4/+4
| |\ | | | | | | | | | [ticket/14943] Fix template loop access by index
| | * [ticket/14943] Fix template loop access by indexjaviexin2016-12-281-4/+4
| | | | | | | | | | | | | | | | | | | | | Allows inserting elements in a loop specified as 'outer[3].inner'. This was coded, but malfunctioning. PHPBB3-14943
* | | Merge pull request #4596 from JoshyPHP/ticket/14914Tristan Darricau2016-12-291-2/+2
|\ \ \ | | | | | | | | | | | | [ticket/14914] Made emoji scale in size with text
| * | | [ticket/14914] Made emoji scale in size with textJoshyPHP2016-12-271-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14914
* | | | Merge pull request #4591 from marc1706/ticket/14934Tristan Darricau2016-12-291-6/+1
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/14934] Use bare PHP functions for checking for tmp dir
| * | | [ticket/14934] Do not rely on open basedir being properly setMarc Alexander2016-12-251-6/+1
| | | | | | | | | | | | | | | | PHPBB3-14934
| * | | [ticket/14934] Use bare PHP functions for checking for tmp dirMarc Alexander2016-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The symfony methods will cause PHP warnings being thrown. PHPBB3-14934
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-252-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/14923] Make sure start for queries is always set in migrationsMarc Alexander2016-12-252-0/+2
| | | | | | | | | | | | PHPBB3-14923
* | | Merge pull request #4582 from marc1706/ticket/14920Máté Bartus2016-12-241-0/+1
|\ \ \ | | | | | | | | | | | | [ticket/14920] Force installer to only populate core migrations
| * | | [ticket/14920] Force installer to only populate core migrationsMarc Alexander2016-12-171-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14920
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-201-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4580 from javiexin/ticket/14918Marc Alexander2016-12-201-1/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14918] Simplify access to extension version metadata information
| | * | | [ticket/14918] Simplify access to extension version metadata informationjaviexin2016-12-161-1/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-14918
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-181-0/+46
|\ \ \ \ | |/ / /
| * | | Merge pull request #4538 from senky/ticket/14874Marc Alexander2016-12-181-0/+46
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14874] Increase size of emotion
| | * | | [ticket/14874] Increase size of emotionJakub Senko2016-12-121-0/+46
| | | | | | | | | | | | | | | | | | | | PHPBB3-14874
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-181-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14770] Decreases quality to 85, changes test to 85, tooCrizzo2016-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14770
| * | | | [ticket/14770] Reduce plupload resize qualityCrizzo2016-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14770
* | | | | [ticket/14925] Prefix modes from reparser with text_reparserMatt Friedman2016-12-181-1/+1
| | | | | | | | | | | | | | | PHPBB3-14925
* | | | | [ticket/14925] Set reparser names in service definitionsMatt Friedman2016-12-186-14/+69
| |_|_|/ |/| | | | | | | | | | | PHPBB3-14925
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-111-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14889] Missing method in profile fields type interface
| * | | Merge pull request #4558 from javiexin/ticket/14889Tristan Darricau2016-12-111-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14889] Missing method in profile fields type interface * javiexin/ticket/14889: [ticket/14889] Missing method in profile fields type interface
| | * | | [ticket/14889] Missing method in profile fields type interfacejaviexin2016-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completes the profile fields type interface by defining a missing required method for all implementations of a type. PHPBB3-14889
| * | | | [ticket/14893] Fix undefined variable on reporting PM notificationrxu2016-12-071-0/+2
| | |_|/ | |/| | | | | | | | | | PHPBB3-14893
* | | | Merge pull request #4562 from rxu/ticket/14893-3.2.xTristan Darricau2016-12-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14893] Fix undefined variable on reporting PM notification * rxu/ticket/14893-3.2.x: [ticket/14893] Fix undefined variable on reporting PM notification
| * | | | [ticket/14893] Fix undefined variable on reporting PM notificationrxu2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14893
* | | | | Merge pull request #4564 from VSEphpbb/ticket/14895Tristan Darricau2016-12-1119-120/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14895] CLI should use SymfonyStyle * VSEphpbb/ticket/14895: [ticket/14895] Fix broken tests [ticket/14895] Fix issues in CLI classes [ticket/14895] Use SymfonyStyle in all CLI [ticket/14895] Use SymfonyIO styling [ticket/14895] CLI reparser:list should display proper list
| * | | | | [ticket/14895] Fix broken testsMatt Friedman2016-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | [ticket/14895] Fix issues in CLI classesMatt Friedman2016-12-0812-35/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | [ticket/14895] Use SymfonyStyle in all CLIMatt Friedman2016-12-0815-83/+100
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | [ticket/14895] Use SymfonyIO stylingMatt Friedman2016-12-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | [ticket/14895] CLI reparser:list should display proper listMatt Friedman2016-12-071-2/+6
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14895
* | | | | [prep-release-3.2.0-RC2] Add migration file for 3.2.0-RC2Marc Alexander2016-12-091-0/+40
| | | | |
* | | | | [ticket/14894] Use correct config name for conflicts archive extensionMarc Alexander2016-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14894
* | | | | [ticket/14891] Don't rely on sys_get_temp_dir() being availableMarc Alexander2016-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or actually returning a path. It might also return an empty string or null. PHPBB3-14891
* | | | | [ticket/14891] Use filesystem classes for checking on tmp dirMarc Alexander2016-12-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache dir will now also only be used if tmp dir does not exist or if it's not writable. PHPBB3-14891
* | | | | [ticket/14891] Remove unused use statementsMarc Alexander2016-12-092-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14891
* | | | | [ticket/14891] Use own proxy instantiator for open_basedir compatibilityMarc Alexander2016-12-092-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also reverted random_compat lib to 1.4.x. PHPBB3-14891
* | | | | Merge pull request #4565 from marc1706/ticket/14896Máté Bartus2016-12-081-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14896] Do not overwrite login when finishing install
| * | | | | [ticket/14896] Do not overwrite login when finishing installMarc Alexander2016-12-071-5/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the user will be "logged in" again as guest user which will prevent any redirectiong to the ACP after the installation. PHPBB3-14896
* | | | | [ticket/14897] Add $restart_progress_bar to iohandler baseMáté Bartus2016-12-071-0/+5
|/ / / / | | | | | | | | | | | | PHPBB3-14897
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-051-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/14890] Typo in input validation of profile fields of type stringjaviexin2016-12-051-1/+1
| |/ / | | | | | | | | | | | | | | | This bug was introduced by PHPBB3-14272 PHPBB3-14890
* | | [ticket/12610] Fix tests and use getOption() for consoleMarc Alexander2016-12-051-18/+20
| | | | | | | | | | | | PHPBB3-12610
* | | [ticket/12610] Use Symfony style guideTristan Darricau2016-12-041-87/+86
| | | | | | | | | | | | PHPBB3-12610
* | | [ticket/12610] Add a better error message when an extension is missingTristan Darricau2016-12-041-44/+63
| | | | | | | | | | | | PHPBB3-12610
* | | [ticket/12610] Correctly handle empty cacheTristan Darricau2016-12-032-8/+29
| | | | | | | | | | | | PHPBB3-12610