* develop-ascraeus:
[ticket/12818] Use assertGreaterThanOrEqual in the tests
[ticket/12818] Don't use the id for i=
[ticket/12818] Add tests
[ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
[ticket/12818] Deleting a log entry in MCP produces a General error
* Nicofuma/ticket/12818:
[ticket/12818] Use assertGreaterThanOrEqual in the tests
[ticket/12818] Don't use the id for i=
[ticket/12818] Add tests
[ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
* develop-ascraeus:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
* develop-ascraeus:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
[ticket/8610] Merging topics does not handle bookmarks correctly
* Nicofuma/ticket/8610:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
* 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
* 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
