[ticket/12895] Rename user style setting to resolve conflict with style param
* marc1706/ticket/12895:
[ticket/12895] Rename user style setting to resolve conflict with style param
* develop-ascraeus:
[ticket/11480] Header file
[ticket/11480] Fix unit tests
[ticket/11480] Move the test into get_folder()
[ticket/11480] Fix the double spaces in phpbb_functional_test_case
[ticket/11480] Fix typos
[ticket/11480] Add functionnal test
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* ticket/11480:
[ticket/11480] Move the test into get_folder()
[ticket/11480] Fix the double spaces in phpbb_functional_test_case
[ticket/11480] Fix typos
[ticket/11480] Add functionnal test
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.
PHPBB3-12895
[ticket/12884] Add core event to the function upload_attachment()
* rxu/ticket/12884:
[ticket/12884] Add core event to the function upload_attachment()
Add core event to the function upload_attachment()
in functions_posting.php to provide ability for extensions
to perform additional actions on uploaded files, like resizing etc.
PHPBB3-12884
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.
PHPBB3-12828
* develop-ascraeus:
[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
[prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
[prep-release-3.1.0-RC2] Prepare Changelog
[prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
[prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
* 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: (34 commits)
[ticket/12775] Set dbal.conn.driver as synthetic during installation
[ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
[ticket/12775] Inject the connection when created in the container
[ticket/12775] Extract the vars later in install/install_update.php
[ticket/12775] Rename config_php_handler to config_php_file container_builder
[ticket/12775] Set defined_vars as a property of config_php_file
[ticket/12775] Fix doc blocks in the container builder
[ticket/12775] Remove useless includes of config.php
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
[ticket/12775] Fix comments
[ticket/12775] Update doc blocks
[ticket/12775] Fix container_builder
[ticket/12775] Rename config_php to config_php_file
[ticket/12775] Renamed to \phpbb\di\container_builder
[ticket/12775] Remove the last include of functions_container
[ticket/12775] Fix unit tests
[ticket/12775] Add tests for \phpbb\config_php
[ticket/12775] Add tests for the container factory
[ticket/12775] Use a field instead of a local var in load_config_var()
[ticket/12775] Update container and config in install/
...
[ticket/12775] Replace functions_container with a container_builder class.
* Nicofuma/ticket/12775: (34 commits)
[ticket/12775] Set dbal.conn.driver as synthetic during installation
[ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
[ticket/12775] Inject the connection when created in the container
[ticket/12775] Extract the vars later in install/install_update.php
[ticket/12775] Rename config_php_handler to config_php_file container_builder
[ticket/12775] Set defined_vars as a property of config_php_file
[ticket/12775] Fix doc blocks in the container builder
[ticket/12775] Remove useless includes of config.php
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
[ticket/12775] Fix comments
[ticket/12775] Update doc blocks
[ticket/12775] Fix container_builder
[ticket/12775] Rename config_php to config_php_file
[ticket/12775] Renamed to \phpbb\di\container_builder
[ticket/12775] Remove the last include of functions_container
[ticket/12775] Fix unit tests
[ticket/12775] Add tests for \phpbb\config_php
[ticket/12775] Add tests for the container factory
[ticket/12775] Use a field instead of a local var in load_config_var()
[ticket/12775] Update container and config in install/
...
