aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | [ticket/12639] Add a test case with an empty keywords listTristan Darricau2014-05-312-1/+6
| | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'PayBas/ticket/12566' into develop-ascraeusCesar G2014-06-022-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * PayBas/ticket/12566: [ticket/12566] Also changed for ucp_pm_viewmessage.php [ticket/12566] "Private messages" should be "Send pivate message"
| * | | [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
* | | Merge pull request #2529 from prototech/ticket/12641Andreas Fischer2014-05-312-5/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one. * prototech/ticket/12641: [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
| * | [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-312-33/+64
|\ \ | |/ |/| | | | | | | | | | | | | [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] Add test searching in a non absolute directoryTristan Darricau2014-05-261-0/+16
| | | | | | | | PHPBB3-12589
| * [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-303-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | [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] Fixup all incorrect uses of file header.Andreas Fischer2014-05-302-2/+2
| | | | | | | | | | | | PHPBB3-12637
| * | [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-307-26/+445
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-283-6/+29
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Remove trailing ;Tristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Fix typo in the class nameTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Add unit testsTristan Darricau2014-05-283-14/+327
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Get $phpbb_log from the containerTristan Darricau2014-05-271-1/+3
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Remove extra ';'Tristan Darricau2014-05-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] TypoTristan Darricau2014-05-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Refactoring in \phpbb\log\log_interfaceTristan Darricau2014-05-105-34/+100
| | | | | | | | | | | | | | | | PHPBB3-10899
| * | | [ticket/10899] Using Delete All in log viewer with keyword searchTristan Darricau2014-05-103-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-10899 PHPBB3-10899
* | | | Merge pull request #2357 from Nicofuma/ticket/11942Joas Schilling2014-05-306-62/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11942] Delete post/topic reason should be added to logs * Nicofuma/ticket/11942: [ticket/11942] Don't change the reason to '' when hard deleting [ticket/11942] Don't show the checkbox if the post is already soft-deleted [ticket/11942] Remove useless IF in templates [ticket/11942] Apply the modifications to subsilver [ticket/11942] Always display delete reason [ticket/11942] Edits messages [ticket/11942] Change the formulation [ticket/11942] Adding the reason to hard deleted topic/post [ticket/11942] Delete post/topic reason should be added to logs
| * | | | [ticket/11942] Don't change the reason to '' when hard deletingTristan Darricau2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | [ticket/11942] Don't show the checkbox if the post is already soft-deletedTristan Darricau2014-05-262-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | [ticket/11942] Remove useless IF in templatesTristan Darricau2014-05-262-31/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | [ticket/11942] Apply the modifications to subsilverTristan Darricau2014-05-113-6/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | [ticket/11942] Always display delete reasonTristan Darricau2014-05-113-16/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | [ticket/11942] Edits messagesNicofuma2014-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11942