Merge pull request #3552 from MateBartus/ticket/13777
[ticket/13777] Move module management related functionailty into service

Add basic travis config to make docs

Install sphinx and deps with pip (python lang so no sudo)

tell travis which branches to build

Merge pull request #19 from nickvergessen/update/mod2ext
Move nickvergessen/howto-convert-phpbb30mod-to-phpbb31ext to doc

Merge pull request #3592 from Nicofuma/ticket/13388
[ticket/13388] Integrate routing and di parameters resolution

[ticket/13874] Add master to sami API docs
PHPBB3-13874

[ticket/13874] Add master to sami API docs
PHPBB3-13874

[ticket/13874] Add master to sami API docs
PHPBB3-13874

Merge pull request #3665 from Nicofuma/ticket/13896
Fix conding style

Merge pull request #3560 from Nicofuma/ticket/13790
[ticket/13790] Update phpcs

Merge branch '3.1.x'
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
        phpBB/composer.json
        phpBB/composer.lock

Merge pull request #3560 from Nicofuma/ticket/13790
[ticket/13790] Update phpcs

Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"

Merge branch 'prep-release-3.1.1' into develop-ascraeus
* prep-release-3.1.1:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
        build/build.xml
        phpBB/includes/constants.php
        phpBB/install/schemas/schema_data.sql

[prep-release-3.1.1] Add 3.1.1 CHANGELOG

[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
PHPBB3-13262

Merge branch 'ticket/13268' into prep-release-3.1.1
* ticket/13268:
  [ticket/13268] Properly append ternary result in get_existing_indexes()

[ticket/13268] Properly append ternary result in get_existing_indexes()
PHPBB3-13268

Merge branch 'ticket/13267' into prep-release-3.1.1
* ticket/13267:
  [ticket/13267] Update Automatic Update instructions to include vendor directory

Merge pull request #3104 from marc1706/ticket/13248-alt
[ticket/13248] Login functions need to use provider collection for retrieving provider

[prep-release-3.1.1] Update version number to 3.1.1

Merge remote-tracking branch 'github-security/ticket/security-164-alt' into prep-release-3.1.1
* github-security/ticket/security-164-alt:
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class

Merge branch 'ticket/13262' into prep-release-3.1.1
* ticket/13262:
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1

[ticket/13271] Disable CC sender feature for anonymous users
PHPBB3-13271

Merge branch 'ticket/13271' into prep-release-3.1.1
* ticket/13271:
  [ticket/13271] Disable CC sender feature for anonymous users

[prep-release-3.1.1] Add 3.1.1 migration file

[ticket/13267] Update Automatic Update instructions to include vendor directory
PHPBB3-13267

Merge remote-tracking branch 'github-marc1706/ticket/13263' into prep-release-3.1.1
* github-marc1706/ticket/13263:
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist

Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13223] Fix USERNAME email template variable in notification

Merge branch 'ticket/13223' into prep-release-3.1.0
* ticket/13223:
  [ticket/13223] Fix USERNAME email template variable in notification

[prep-release-3.1.0] Update CHANGELOG with last minute changes

[ticket/13223] Fix USERNAME email template variable in notification
admin_activate_user.php notification type is assigning usernames to email
template variables using user_loader->get_username() in 'no_profile' mode,
which in its turn calls get_username_string() function in 'no_profile' mode.
This causes HTML markup in emails for username colour.

PHPBB3-13223

Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes

Merge remote-tracking branch 'github-marc1706/ticket/13207' into develop-ascraeus
* github-marc1706/ticket/13207:
  [ticket/13207] Use assert_checkbox_is_checked for registration test

[develop-ascraeus] Update version number to 3.1.1-RC1-dev

Merge pull request #3067 from marc1706/ticket/13216
[ticket/13216] Use gmdate() instead of date() in datetime tests

Merge pull request #3056 from marc1706/ticket/13203
[ticket/13203] Use constant time comparison method for comparing password hashes

Merge pull request #3017 from nickvergessen/ticket/13033
[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"

Merge pull request #3552 from MateBartus/ticket/13777
[ticket/13777] Move module management related functionailty into service

Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13531] Send 404 Not Found.
  [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).

Merge pull request #3316 from bantu/ticket/13531
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).

[ticket/13234] Never allow autologin/remember me to modify the userid
This prevents admin relogin with forced user id from overwriting
remember me cookies

PHPBB3-13234

[ticket/13234-2] Correctly verify that user_id is set in user data array
PHPBB3-13234-2

Merge branch 'ticket/13234' into ticket/13234-2
* ticket/13234:
  [ticket/13234] Never allow autologin/remember me to modify the userid

[ticket/13234-2] Never allow autologin/remember me to modify the userid
Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit

PHPBB3-13234

[ticket/13234-2] Correctly verify that user_id is set in user data array
PHPBB3-13234-2

[ticket/13234] Never allow autologin/remember me to modify the userid
This prevents admin relogin with forced user id from overwriting
remember me cookies

PHPBB3-13234

[ticket/13234-2] Never allow autologin/remember me to modify the userid
Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit

PHPBB3-13234

Merge branch 'ticket/13234' into ticket/13234-2
* ticket/13234:
  [ticket/13234] Never allow autologin/remember me to modify the userid

Merge remote-tracking branch 'github-marc1706/ticket/13207' into develop-ascraeus
* github-marc1706/ticket/13207:
  [ticket/13207] Use assert_checkbox_is_checked for registration test

[develop-ascraeus] Update version number to 3.1.1-RC1-dev

Merge pull request #3067 from marc1706/ticket/13216
[ticket/13216] Use gmdate() instead of date() in datetime tests

[ticket/13205] Remove superfluous newline
PHPBB3-13205

[ticket/13205] Add a mark all messages read link to PM folders
PHPBB3-13205

[ticket/13205] Explicitly cast ids to integers and reformat SQL
PHPBB3-13205

Merge pull request #3001 from Nicofuma/ticket/13113
[ticket/13113] Updates the base url only when the front-end isn't app.php