aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11711] Reduce size of tests and also test topic titlesMarc Alexander2014-06-092-31/+19
| | | | PHPBB3-11711
* [ticket/11711] Improve checks for unsupported characters and check subjectMarc Alexander2014-06-093-8/+13
| | | | PHPBB3-11711
* [ticket/11711] Inform user of unsupported characters while postingMarc Alexander2014-06-093-0/+52
| | | | PHPBB3-11711
* Merge pull request #2553 from rxu/ticket/12668Joas Schilling2014-06-091-10/+12
|\ | | | | | | | | | | | | [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars event * rxu/ticket/12668: [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
| * [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
|/ | | | | | | | Add subforums template data array to 'core.display_forums_modify_template_vars' event to allow extensions to modify it if needed. PHPBB3-12668
* Merge pull request #2554 from rxu/ticket/12669Joas Schilling2014-06-091-0/+22
|\ | | | | | | | | | | | | [ticket/12669] Add core event to the function display_forums() * rxu/ticket/12669: [ticket/12669] Add core event to the function display_forums()
| * [ticket/12669] Add core event to the function display_forums()rxu2014-06-081-0/+22
| | | | | | | | | | | | | | | | Add core event to the function display_forums() in includes/functions_display.php to allow assigning additional template data for every forum, f.e. additional forumrow subloops. PHPBB3-12669
* | Merge branch 'k0nsl-ticket/12677' into develop-ascraeusJoas Schilling2014-06-091-1/+1
|\ \ | | | | | | | | | | | | * k0nsl-ticket/12677: [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
| * | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display ↵Knecht Ruprecht2014-06-091-1/+1
|/ / | | | | | | | | | | comment PHPBB3-12677
* | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-olympus: [ticket/12660] Improve check for when phpinfo() is disabled.
| * \ Merge pull request #2548 from bantu/ticket/12660Dhruv Goel2014-06-091-1/+1
| |\ \ | | | | | | | | [ticket/12660] Improve check for when phpinfo() is disabled.
| | * | [ticket/12660] Improve check for when phpinfo() is disabled.Andreas Fischer2014-06-091-1/+1
| |/ / | | | | | | | | | PHPBB3-12660
* | | 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 mods * brunoais/ticket/12672: [ticket/12672] Make tab intercept; CB for keypress only react without key mods
| * | | [ticket/12672] Make tab intercept; CB for keypress only react without key modsbrunoais2014-06-071-1/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Changed the callback of keypress inside the <textarea> for the posting such that, if key 9 is pressed (tab character) and ctrl, shift, alt and meta are not pressed the tab is placed. Otherwise, nothing is made and default is not prevented. PHPBB3-12672
* | | Merge pull request #2561 from marc1706/ticket/12675Andreas Fischer2014-06-092-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12675] Fix code sniffer complaints introduced by recent commits * marc1706/ticket/12675: [ticket/12675] Fix code sniffer complaints introduced by recent commits
| * | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12675
* | | | 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 paths
| * | | [ticket/11331] Inform user that double dots will be stripped from avatar pathsMarc Alexander2014-06-071-2/+2
| |/ / | | | | | | | | | PHPBB3-11331
* | | Merge remote-tracking branch 'bantu/ticket/12673' into develop-ascraeusMarc Alexander2014-06-081-2/+8
|\ \ \ | |/ / |/| | | | | | | | * bantu/ticket/12673: [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
| * | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
|/ / | | | | | | PHPBB3-12673
* | Merge pull request #2543 from Nicofuma/ticket/12655Andreas Fischer2014-06-065-4/+86
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12655] Run phpbbcli as a shell when --shell or -s is used * Nicofuma/ticket/12655: [ticket/12655] Set register_container_commands as public [ticket/12655] Don't try to restore the definition in the help [ticket/12655] Fix coding style [ticket/12655] Make the --shell option available only for phpbbcli.php [ticket/12655] Fix coding style in \phpbb\console\application [ticket/12655] Set the arguments of \phpbb\console\application as required [ticket/12655] Don't require acp/common again in the commands [ticket/12655] Run the shell when --shell is used
| * | [ticket/12655] Set register_container_commands as publicTristan Darricau2014-06-051-4/+1
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Don't try to restore the definition in the helpTristan Darricau2014-06-051-9/+4
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Fix coding styleTristan Darricau2014-06-051-7/+8
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Make the --shell option available only for phpbbcli.phpTristan Darricau2014-06-041-3/+44
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Fix coding style in \phpbb\console\applicationTristan Darricau2014-06-041-2/+8
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Set the arguments of \phpbb\console\application as requiredTristan Darricau2014-06-041-1/+1
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Don't require acp/common again in the commandsTristan Darricau2014-06-042-2/+1
| | | | | | | | | | | | PHPBB3-12655
| * | [ticket/12655] Run the shell when --shell is usedTristan Darricau2014-06-043-1/+44
| | | | | | | | | | | | PHPBB3-12655
* | | Merge pull request #2509 from Stephannos/ticket/12602Andreas Fischer2014-06-067-0/+236
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12602] Add command to print the cron list * Stephannos/ticket/12602: [ticket/12602] Fix language key removal. [ticket/12602] Rectify language keys. [ticket/12602] Fix test mistake. [ticket/12602] Fix language var mistakes. [ticket/12602] Add types, change description of cron:list. [ticket/12602] Fix internationalisation of cron_list.php [ticket/12602] Fix spaces issues. [ticket/12602] Coding style correction. [ticket/12602] Fix coding style mistakes. [ticket/12602] Headers updated. [ticket/12602] Changes to respect coding style and to factorize code. [ticket/12602] Cleanup tests [ticket/12602] Add function get_tasks. [ticket/12602] Correction of the output message for the cron list [ticket/12602] Add files to print the cron list and test files.
| * | | [ticket/12602] Fix language key removal.Etienne Baroux2014-06-061-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Rectify language keys.Etienne Baroux2014-06-063-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Fix test mistake.Etienne Baroux2014-06-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Fix language var mistakes.Etienne Baroux2014-06-062-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Add types, change description of cron:list.Etienne Baroux2014-06-052-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Fix internationalisation of cron_list.phpEtienne Baroux2014-06-051-0/+2
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Fix spaces issues.Etienne Baroux2014-06-042-6/+6
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Coding style correction.Etienne Baroux2014-06-041-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Fix coding style mistakes.Etienne Baroux2014-06-033-2/+4
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Headers updated.Etienne Baroux2014-06-032-9/+17
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Changes to respect coding style and to factorize code.Etienne Baroux2014-06-033-46/+45
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | Merge pull request #3 from Nicofuma/Stephannos-ticket/12602Stephannos2014-06-024-50/+9
| |\ \ \ | | | | | | | | | | [ticket/12602] Cleanup tests
| | * | | [ticket/12602] Cleanup testsTristan Darricau2014-06-024-50/+9
| |/ / / | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Add function get_tasks.Etienne Baroux2014-06-021-0/+15
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Correction of the output message for the cron listEtienne Baroux2014-06-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12602
| * | | [ticket/12602] Add files to print the cron list and test files.Etienne Baroux2014-06-028-0/+251
| | | | | | | | | | | | | | | | PHPBB3-12602
* | | | Merge pull request #2552 from marc1706/ticket/12666Andreas Fischer2014-06-064-6/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12666] Use "None" for images in root of gallery avatar path * marc1706/ticket/12666: [ticket/12666] Use "None" for images in root of gallery avatar path
| * | | | [ticket/12666] Use "None" for images in root of gallery avatar pathMarc Alexander2014-06-054-6/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | "None" serves no real purpose right now. After this it will be used instead of "Main" for images in the root of the gallery avatar path. PHPBB3-12666
* | | | Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeusCesar G2014-06-042-15/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12541: [ticket/12541] Activate attachments tab when files are dropped into textarea Conflicts: phpBB/styles/prosilver/template/forum_fn.js
| * | | | [ticket/12541] Activate attachments tab when files are dropped into textareaPayBas2014-06-022-14/+29
| |/ / / | | | | | | | | | | | | PHPBB3-12541