aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge remote-tracking branch 'PayBas/ticket/12615' into develop-ascraeusCesar G2014-06-042-1/+7
|\ \ \ | | | | | | | | | | | | | | | | * PayBas/ticket/12615: [ticket/12615] Fixed inproper clearing of .topic-actions
| * | | [ticket/12615] Fixed inproper clearing of .topic-actionsPayBas2014-05-302-1/+7
| | | | | | | | | | | | | | | | PHPBB3-12615
* | | | Merge remote-tracking branch 'PayBas/ticket/12565' into develop-ascraeusCesar G2014-06-0417-20/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12565: [ticket/12565] Empty anchors introduce white-space in IE11
| * | | | [ticket/12565] Empty anchors introduce white-space in IE11PayBas2014-06-0217-20/+28
| | |/ / | |/| | | | | | | | | | PHPBB3-12565
* | | | Merge pull request #2536 from PayBas/ticket/12521Cesar G2014-06-041-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/12521] Fix MCP merge topics row overflow
| * | | | [ticket/12521] Fix MCP merge topics row overflowPayBas2014-06-021-2/+2
| |/ / / | | | | | | | | | | | | PHPBB3-12521
* | | | Merge pull request #2539 from marc1706/ticket/12457Andreas Fischer2014-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12457] Default to first category if none is selected in gallery avatar * marc1706/ticket/12457: [ticket/12457] Default to first category if none is selected in gallery avatar
| * | | | [ticket/12457] Default to first category if none is selected in gallery avatarMarc Alexander2014-06-031-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | If any category exists, the key() function should always return the first key of the $avatar_list array. PHPBB3-12457
* | | | Merge pull request #2526 from Nicofuma/ticket/12639Andreas Fischer2014-06-044-59/+147
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12639] Delete entry in admin-log leads to mysql-error * Nicofuma/ticket/12639: [ticket/12639] Add a space in the code generated by generate_sql_keyword() [ticket/12639] Handle $conditions['keywords'] outside of the loop [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs [ticket/12639] Send a correct IN entry when deleting marked logs [ticket/12639] Use assertSame [ticket/12639] Remove old commented tests [ticket/12639] Order the results correctly in the test [ticket/12639] Fix tests on postgres [ticket/12639] Update tests to use a dataProvider [ticket/12639] Add a test case with an empty keywords list [ticket/12639] Delete entry in admin-log leads to mysql-error
| * | | | [ticket/12639] Add a space in the code generated by generate_sql_keyword()Tristan Darricau2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Handle $conditions['keywords'] outside of the loopTristan Darricau2014-06-021-16/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logsTristan Darricau2014-06-021-7/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Send a correct IN entry when deleting marked logsTristan Darricau2014-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Use assertSameTristan Darricau2014-06-011-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Remove old commented testsTristan Darricau2014-06-011-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Order the results correctly in the testTristan Darricau2014-05-311-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Fix tests on postgresTristan Darricau2014-05-311-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Update tests to use a dataProviderTristan Darricau2014-05-311-31/+128
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639