[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
* PayBas/ticket/12541:
[ticket/12541] Activate attachments tab when files are dropped into textarea
Conflicts:
phpBB/styles/prosilver/template/forum_fn.js
[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
* develop-ascraeus:
[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] 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/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
* develop-ascraeus:
[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] 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/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.
* develop-ascraeus:
[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] 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
* develop-ascraeus:
[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] 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
* develop-ascraeus:
[ticket/11467] Add user object to extension manager for tests
[ticket/11467] Add language variables to tests
[ticket/11467] Add language variables for extension exception messages
[ticket/11467] Add language variables for extension exception messages
* n-aleha/ticket/11467:
[ticket/11467] Add user object to extension manager for tests
[ticket/11467] Add language variables to tests
[ticket/11467] Add language variables for extension exception messages
