DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).
PHPBB3-14495
Some array_key calls were incorrect in the
notification checks for quotes. Two calls were
being made in a row, resulting in incorrect arrays.
PHPBB3-14572
[ticket/14272] Use html5 valid input elements
* marc1706/ticket/14272-3.2.x:
[ticket/14272] Allow input of floats for filesize
[ticket/14272] Use input type number instead of text in avatars
[ticket/14272] Assign min and max values for avatar driver settings
[ticket/14272] Define min and max values for avatar width and height
[ticket/14272] Disable not toggled form elements
[ticket/14272] Make sure phpbb_avatar_manager was defined
[ticket/14272] Remove useless check
[ticket/14272] Fix invalid or missing min/max settings
[ticket/14272] Assign min/max for all allowed types
[ticket/14272] Only use maxlength and size for allowed input elements
[ticket/14272] Use html5 valid input elements
* marc1706/ticket/14272:
[ticket/14272] Allow input of floats for filesize
[ticket/14272] Use input type number instead of text in avatars
[ticket/14272] Assign min and max values for avatar driver settings
[ticket/14272] Define min and max values for avatar width and height
[ticket/14272] Disable not toggled form elements
[ticket/14272] Make sure phpbb_avatar_manager was defined
[ticket/14272] Remove useless check
[ticket/14272] Fix invalid or missing min/max settings
[ticket/14272] Assign min/max for all allowed types
[ticket/14272] Only use maxlength and size for allowed input elements
* 3.1.x:
[ticket/14481] Add tests for x_forwarded_proto header
[ticket/14481] Use port 443 if https is specified in x-forwarded-proto
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
* marc1706/ticket/14481:
[ticket/14481] Add tests for x_forwarded_proto header
[ticket/14481] Use port 443 if https is specified in x-forwarded-proto
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
[ticket/12684] Add console command user:add
* VSEphpbb/ticket/12684: (26 commits)
[ticket/12684] Use a switch statement for readability
[ticket/12684] Refactor a test
[ticket/12684] Use interactive method correctly
[ticket/12684] Extract interactivity to a method
[ticket/12684] Update option help
[ticket/12684] Add extended help for the user:add command
[ticket/12684] Add shorthand alternates to the options
[ticket/12684] Remove whitespace
[ticket/12684] Add an error on user creation failure
[ticket/12684] Remove unnecessary null arguments
[ticket/12684] Additional clean up
[ticket/12684] Allowed to use $this in enclosure
[ticket/12684] Move all lang keys to cli
[ticket/12684] Fix a few mistakes and clean it up
[ticket/12684] Some code clean up
[ticket/12684] Another little fix
[ticket/12684] Fix tests
[ticket/12684] Update to use non-deprecated methods
[ticket/12684] Add send email option
[ticket/12684] Add input validation
...
[ticket/13842] Prevent internal server errors without rewrite module on IIS
* marc1706/ticket/13842:
[ticket/13842] Prevent internal server errors without rewrite module on IIS
* 3.1.x:
[ticket/14437] Make sure attachments array is properly ordered before processing
[ticket/14437] Preserve attachment ID order by ordering by attach_id
[ticket/14437] Sort attachments after assigning inline attachments
[ticket/14437] Correctly assume index from attachment display order
[ticket/14437] Correctly assume index from attachment display order
* marc1706/ticket/14437:
[ticket/14437] Make sure attachments array is properly ordered before processing
[ticket/14437] Preserve attachment ID order by ordering by attach_id
[ticket/14437] Sort attachments after assigning inline attachments
[ticket/14437] Correctly assume index from attachment display order
[ticket/14497] Support second app.php script in install folder
* marc1706/ticket/14497:
[ticket/14497] Do not check for doctype on index and use correct return
[ticket/14497] Add test for visiting installer
[ticket/14497] Use nginx sample config in travis tests
[ticket/14497] Support second app.php script in install folder