aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-10/+12
|\
| * Merge pull request #2553 from rxu/ticket/12668Joas Schilling2014-06-091-10/+12
| |\
| | * [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
| |/
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-0/+22
|\ \ | |/
| * Merge pull request #2554 from rxu/ticket/12669Joas Schilling2014-06-091-0/+22
| |\
| | * [ticket/12669] Add core event to the function display_forums()rxu2014-06-081-0/+22
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-1/+1
|\ \ \ | |/ /
| * | Merge branch 'k0nsl-ticket/12677' into develop-ascraeusJoas Schilling2014-06-091-1/+1
| |\ \
| | * | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display com...Knecht Ruprecht2014-06-091-1/+1
| |/ /
* | | Merge branch 'develop-ascraeus' into developDhruv2014-06-091-1/+1
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-091-1/+1
| |\ \
| | * \ Merge pull request #2548 from bantu/ticket/12660Dhruv Goel2014-06-091-1/+1
| | |\ \
| | | * | [ticket/12660] Improve check for when phpinfo() is disabled.Andreas Fischer2014-06-091-1/+1
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-091-1/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #2556 from brunoais/ticket/12672Andreas Fischer2014-06-091-1/+5
| |\ \ \
| | * | | [ticket/12672] Make tab intercept; CB for keypress only react without key modsbrunoais2014-06-071-1/+5
| | | |/ | | |/|
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-092-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #2561 from marc1706/ticket/12675Andreas Fischer2014-06-092-2/+2
| |\ \ \
| | * | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-06-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2555 from marc1706/ticket/11331Dhruv Goel2014-06-091-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/11331] Inform user that double dots will be stripped from avatar pathsMarc Alexander2014-06-071-2/+2
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-06-081-2/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'bantu/ticket/12673' into develop-ascraeusMarc Alexander2014-06-081-2/+8
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
| |/ /
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-065-4/+86
|\ \ \ | |/ /
| * | Merge pull request #2543 from Nicofuma/ticket/12655Andreas Fischer2014-06-065-4/+86
| |\ \
| | * | [ticket/12655] Set register_container_commands as publicTristan Darricau2014-06-051-4/+1
| | * | [ticket/12655] Don't try to restore the definition in the helpTristan Darricau2014-06-051-9/+4
| | * | [ticket/12655] Fix coding styleTristan Darricau2014-06-051-7/+8
| | * | [ticket/12655] Make the --shell option available only for phpbbcli.phpTristan Darricau2014-06-041-3/+44
| | * | [ticket/12655] Fix coding style in \phpbb\console\applicationTristan Darricau2014-06-041-2/+8
| | * | [ticket/12655] Set the arguments of \phpbb\console\application as requiredTristan Darricau2014-06-041-1/+1
| | * | [ticket/12655] Don't require acp/common again in the commandsTristan Darricau2014-06-042-2/+1
| | * | [ticket/12655] Run the shell when --shell is usedTristan Darricau2014-06-043-1/+44
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-067-0/+236
|\ \ \ \ | |/ / /
| * | | Merge pull request #2509 from Stephannos/ticket/12602Andreas Fischer2014-06-067-0/+236
| |\ \ \
| | * | | [ticket/12602] Fix language key removal.Etienne Baroux2014-06-061-0/+1
| | * | | [ticket/12602] Rectify language keys.Etienne Baroux2014-06-063-3/+3
| | * | | [ticket/12602] Fix test mistake.Etienne Baroux2014-06-061-1/+1
| | * | | [ticket/12602] Fix language var mistakes.Etienne Baroux2014-06-062-2/+2
| | * | | [ticket/12602] Add types, change description of cron:list.Etienne Baroux2014-06-052-2/+2
| | * | | [ticket/12602] Fix internationalisation of cron_list.phpEtienne Baroux2014-06-051-0/+2
| | * | | [ticket/12602] Fix spaces issues.Etienne Baroux2014-06-042-6/+6
| | * | | [ticket/12602] Coding style correction.Etienne Baroux2014-06-041-1/+0
| | * | | [ticket/12602] Fix coding style mistakes.Etienne Baroux2014-06-033-2/+4
| | * | | [ticket/12602] Headers updated.Etienne Baroux2014-06-032-9/+17
| | * | | [ticket/12602] Changes to respect coding style and to factorize code.Etienne Baroux2014-06-033-46/+45
| | * | | Merge pull request #3 from Nicofuma/Stephannos-ticket/12602Stephannos2014-06-024-50/+9
| | |\ \ \
| | | * | | [ticket/12602] Cleanup testsTristan Darricau2014-06-024-50/+9
| | |/ / /