aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-301-7/+124
|\
| * [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| * [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| * [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| * [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| * [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-291-7/+123
* | [ticket/13896] Fix coding styleTristan Darricau2015-05-301-1/+1
* | Merge branch '3.1.x'Nils Adermann2015-05-3016-17/+3
|\ \ | |/ |/|
| * Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3016-17/+3
| |\
| | * [ticket/13790] Update phpcsTristan Darricau2015-05-1916-17/+3
* | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ \ \
| * | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| * | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
* | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-296-15/+466
|\ \ \ \
| * | | | [ticket/13844] Add eventsJoas Schilling2015-05-202-11/+57
| * | | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| * | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-161-0/+165
| * | | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-163-0/+251
* | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-292-0/+50
|\ \ \ \ \
| * | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-251-3/+4
| * | | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-252-0/+49
* | | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-291-1/+7
|\ \ \ \ \ \
| * | | | | | [ticket/13860] Fixed array-to-string conversionJoshyPHP2015-05-281-1/+7
| |/ / / / /
* | | | | | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-291-43/+0
|\ \ \ \ \ \
| * | | | | | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-231-43/+0
* | | | | | | Merge pull request #3554 from Nicofuma/ticket/13770Nils Adermann2015-05-291-245/+251
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13770] Use dummy cache driverNicofuma2015-05-141-1/+1
| * | | | | | | [ticket/13770] Fix testsNicofuma2015-05-141-35/+48
| * | | | | | | [ticket/13770] Update testsTristan Darricau2015-05-141-1/+4
| * | | | | | | [ticket/13770] Wither interface for container_builderTristan Darricau2015-05-141-257/+247
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-282-3/+87
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
* | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-15/+70
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| | * | | | | | [ticket/13661] Re-Fixed $log_type -> $log_timebrunoais2015-03-011-1/+1
| | * | | | | | [ticket/13661] Wrong event @since versionbrunoais2015-03-011-1/+1
| | * | | | | | [ticket/13661] Removed superfluous whitespacebrunoais2015-03-011-1/+1
| | * | | | | | [ticket/13661] bugfix: The conditional is the log_time, not log_typebrunoais2015-03-011-3/+3
| | * | | | | | [ticket/13661] Fixed the "FROM" in the built query.brunoais2015-03-011-1/+4
| | * | | | | | [ticket/13661] Add event to allow editing the queries used to get the logsbrunoais2015-03-011-2/+45
| | * | | | | | [ticket/13661] Transform queries to get logs and log count into built queriesbrunoais2015-02-281-15/+23
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-221-5/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
| |\ \ \ \ \ \
| | * | | | | | [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
* | | | | | | | Merge pull request #3608 from Nicofuma/ticket/13829Marc Alexander2015-05-201-22/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13829] Don't fail if the cache isn't writeableNicofuma2015-05-141-22/+37
* | | | | | | | | Merge pull request #3621 from Nicofuma/ticket/13849Marc Alexander2015-05-201-3/+3
|\ \ \ \ \ \ \ \ \