* exreaction/ticket/11881:
[ticket/11881] Move convert_timezones_test to migrator
[ticket/11881] Fix test filename
[ticket/11881] Limit to 500
[ticket/11881] Make sure user_timezone isn't converted twice
[ticket/11881] Better split the timezone conversion into chunks; add test
[ticket/11881] Timezone migration can take a long time
[ticket/12467] Add config*.php and tests_config*.php to .gitignore
* nickvergessen/ticket/12467:
[ticket/12467] Add config*.php and tests_config*.php to .gitignore
Using a static attribute to store the initial state of the feeds instead
of transmit it with the @depends annotation.
This attribute is also added to backupStaticAttributesBlackList
PHPBB3-12413
* develop-ascraeus:
[ticket/8558] Fix operator
[ticket/8558] Fix field length in ACP
[ticket/8558] Use only one variable and improve explain string
[ticket/8558] Add config in migrations and schema_data
[ticket/8558] Add display name in emails from board
* github-elsensee/ticket/stenudd/8558-2:
[ticket/8558] Fix operator
[ticket/8558] Fix field length in ACP
[ticket/8558] Use only one variable and improve explain string
[ticket/8558] Add config in migrations and schema_data
[ticket/8558] Add display name in emails from board
Conflicts:
phpBB/includes/functions_messenger.php
* github-elsensee/ticket/stenudd/8558:
[ticket/8558] Do string concatenation only once and do htmlspecialchars
[ticket/8558] Add display name in emails from board
* develop-ascraeus: (55 commits)
[ticket/12273] Move $extension to constructor so the path is always set
[ticket/12273] Find events.md relative from the path not the phpbb root
[ticket/12273] Do not look in extensions docs/ and tests/ directory
[ticket/12273] Also check file for adm "Location:" events
[ticket/12273] Do not allow template events in non-html files
[ticket/12273] Fix return description
[ticket/12273] Update exporter to allow specifying an extension
[ticket/12273] Allow to filter events for extensions
[ticket/12273] Remove old parameter from function call
[ticket/12273] Fix table header for adm events
[ticket/12273] Add root path to recursive_event_filter_iterator
[ticket/12273] Fix missing classes in export_events_for_wiki.php
[ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
[ticket/12273] Use RecursiveDirectoryIterator in md_exporter
[ticket/12273] Fix doc blocks
[ticket/12273] Do not allow 3.1-A1 for template events
[ticket/12273] Sort arguments alphabetically before exporting
[ticket/12273] Do not allow 3.1-A1 version
[ticket/12273] Update since version to 3.1.0-a* style
[ticket/12273] Update existing events
...
* github-nickvergessen/ticket/12273: (55 commits)
[ticket/12273] Move $extension to constructor so the path is always set
[ticket/12273] Find events.md relative from the path not the phpbb root
[ticket/12273] Do not look in extensions docs/ and tests/ directory
[ticket/12273] Also check file for adm "Location:" events
[ticket/12273] Do not allow template events in non-html files
[ticket/12273] Fix return description
[ticket/12273] Update exporter to allow specifying an extension
[ticket/12273] Allow to filter events for extensions
[ticket/12273] Remove old parameter from function call
[ticket/12273] Fix table header for adm events
[ticket/12273] Add root path to recursive_event_filter_iterator
[ticket/12273] Fix missing classes in export_events_for_wiki.php
[ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
[ticket/12273] Use RecursiveDirectoryIterator in md_exporter
[ticket/12273] Fix doc blocks
[ticket/12273] Do not allow 3.1-A1 for template events
[ticket/12273] Sort arguments alphabetically before exporting
[ticket/12273] Do not allow 3.1-A1 version
[ticket/12273] Update since version to 3.1.0-a* style
[ticket/12273] Update existing events
...
* develop-ascraeus:
[ticket/12371] Fix language string
[ticket/12371] Fix typos in comment
[ticket/12371] Fix redirect link for approve_post and post_in_queue
[ticket/12371] Delete the approve_post notification when editing a post
[ticket/12371] Fix language in comment
[ticket/12371] Reapprove the post and topic again in tests
[ticket/12371] Correctly set is_starter when editing first post of the topic
[ticket/12371] Add functional tests for reapproving
[ticket/12371] Fix query in mcp_sorting()
[ticket/12371] Rename disapprove and softdelete tests
[ticket/12371] We do not group quote notifications anymore
[ticket/12371] Fix SQL query
[ticket/11772] Do not send out new topic/post notifications when reapproving
[ticket/12052] Use different visibility when post was edited
[ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
[ticket/12371] Do not add unlimited users as responders
[ticket/12371] Do not update the notification entry unneccessarily
[ticket/12371] Do not delete post related notifications when a post is deleted
[ticket/12371] Allow notification types to redirect to a different url
[ticket/12371] Do not group "quote" notifications
* github-nickvergessen/ticket/12371:
[ticket/12371] Fix language string
[ticket/12371] Fix typos in comment
[ticket/12371] Fix redirect link for approve_post and post_in_queue
[ticket/12371] Delete the approve_post notification when editing a post
[ticket/12371] Fix language in comment
[ticket/12371] Reapprove the post and topic again in tests
[ticket/12371] Correctly set is_starter when editing first post of the topic
[ticket/12371] Add functional tests for reapproving
[ticket/12371] Fix query in mcp_sorting()
[ticket/12371] Rename disapprove and softdelete tests
[ticket/12371] We do not group quote notifications anymore
[ticket/12371] Fix SQL query
[ticket/11772] Do not send out new topic/post notifications when reapproving
[ticket/12052] Use different visibility when post was edited
[ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
[ticket/12371] Do not add unlimited users as responders
[ticket/12371] Do not update the notification entry unneccessarily
[ticket/12371] Do not delete post related notifications when a post is deleted
[ticket/12371] Allow notification types to redirect to a different url
[ticket/12371] Do not group "quote" notifications
# By Crizzo
# Via Crizzo (1) and Nathaniel Guse (1)
* develop-ascraeus:
[ticket/12404] Splits up the line 18 in subsilver2 into more lines
[ticket/12404] Changes append/prepend to after/before
[ticket/12404] Adds two new events and changes some places
[ticket/12404] Adds a new event before and after the Timezone display
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
[ticket/12404] Splits up the line 18 in subsilver2 into more lines
[ticket/12404] Changes append/prepend to after/before
[ticket/12404] Adds two new events and changes some places
[ticket/12404] Adds a new event before and after the Timezone display
