aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2509 from Stephannos/ticket/12602Andreas Fischer2014-06-064-0/+112
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-062-2/+2
| | | | | | | | 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-041-1/+1
| | | | | | | | PHPBB3-12602
| * [ticket/12602] Coding style correction.Etienne Baroux2014-06-041-1/+0
| | | | | | | | PHPBB3-12602
| * [ticket/12602] Fix coding style mistakes.Etienne Baroux2014-06-032-1/+2
| | | | | | | | PHPBB3-12602
| * [ticket/12602] Headers updated.Etienne Baroux2014-06-031-3/+7
| | | | | | | | PHPBB3-12602
| * [ticket/12602] Changes to respect coding style and to factorize code.Etienne Baroux2014-06-032-14/+15
| | | | | | | | 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-023-0/+89
| | | | | | | | PHPBB3-12602
* | [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-043-27/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add a test case with an empty keywords listTristan Darricau2014-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| * | | | [ticket/12639] Delete entry in admin-log leads to mysql-errorTristan Darricau2014-05-313-6/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
* | | | | Merge remote-tracking branch 'prototech/ticket/12640' into develop-ascraeusMarc Alexander2014-06-044-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * prototech/ticket/12640: [ticket/12640] Preserve the active tab when previewing in posting page.
| * | | | [ticket/12640] Preserve the active tab when previewing in posting page.Cesar G2014-05-314-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12640
* | | | | [ticket/12566] Also changed for ucp_pm_viewmessage.phpPayBas2014-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12566
* | | | | [ticket/12566] "Private messages" should be "Send pivate message"PayBas2014-06-021-1/+1
| |_|/ / |/| | | | | | | | | | | PHPBB3-12566
* | | | [ticket/12641] Use jQuery's trim() method. IE8 does not support the native oneCesar G2014-05-312-5/+5
|/ / / | | | | | | | | | PHPBB3-12641
* | | Merge pull request #2494 from Nicofuma/ticket/12589Joas Schilling2014-05-311-33/+48
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | [ticket/12589] Search directly in $directory if it's an absolute sub-path * Nicofuma/ticket/12589: [ticket/12589] Add test searching in a non absolute directory [ticket/12589] Fix tests [ticket/12589] Search directly in $directory if it's an absolute sub-path
| * | [ticket/12589] Fix testsTristan Darricau2014-05-241-43/+45
| | | | | | | | | | | | PHPBB3-12589
| * | [ticket/12589] Search directly in $directory if it's an absolute sub-pathTristan Darricau2014-05-241-1/+14
| | | | | | | | | | | | PHPBB3-12589
* | | [develop-ascraeus] Correct capitalisation of NeoThermic.Andreas Fischer2014-05-311-2/+2
| | |
* | | Merge pull request #2524 from bantu/ticket/12637Joas Schilling2014-05-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12637] Correct file header in coding-guidelines * bantu/ticket/12637: [ticket/12637] Fixup all incorrect uses of file header. [ticket/12637] Correctly escape the file header in coding-guidelines.html.
| * | | [ticket/12637] Correctly escape the file header in coding-guidelines.html.Andreas Fischer2014-05-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12637
* | | | Merge pull request #2433 from Nicofuma/ticket/10899Joas Schilling2014-05-305-26/+153
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10899] Using Delete All in log viewer with keyword search * Nicofuma/ticket/10899: [ticket/10899] Update doc block [ticket/10899] Use isset($field_value['IN']) [ticket/10899] Add event core.delete_log [ticket/10899] Remove trailing ; [ticket/10899] Fix typo in the class name [ticket/10899] Add unit tests [ticket/10899] Get $phpbb_log from the container [ticket/10899] Remove extra ';' [ticket/10899] Typo [ticket/10899] Refactoring in \phpbb\log\log_interface [ticket/10899] Using Delete All in log viewer with keyword search
| * | | | [ticket/10899] Update doc blockTristan Darricau2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Use isset($field_value['IN'])Tristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Add event core.delete_logTristan Darricau2014-05-282-5/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Remove trailing ;Tristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Add unit testsTristan Darricau2014-05-281-14/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Get $phpbb_log from the containerTristan Darricau2014-05-271-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899