* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11329] Moving colors to colours.css
[ticket/9492] Fix missing phpbb_container in unit tests
[ticket/9492] Fix typo in SQL query
[ticket/9492] Ensure to delete the avatar/rank data when we change it
[ticket/9492] Ensure to update all avatar values when the avatar is changed
[ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
[ticket/9492] Add unit tests for custom ranks and avatars
[ticket/9492] Retain custom ranks and avatars when setting users default group
[ticket/11328] Replace long buttons text with short text
[ticket/11328] Add language variables for buttons
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/11201] Remove database column on update
[ticket/10431] Remove .left class from reply-all
[ticket/10431] Remove reply-all custom css
[ticket/10431] Adjustments for large buttons
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11201] Remove MSN/WLM fields
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
...
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
[ticket/11171] Moved the DB schema changes to its place
[ticket/11171] Cleanup of leftovers
[ticket/11171] Adapted the code in report.php
[ticket/11171] Use the options stored to decide how to show it
[ticket/11171] DB changes for the update
[ticket/11171] DB additions for these changes
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.
PHPBB3-11201
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.
PHPBB3-11309
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
* p/ticket/10758:
[ticket/10758] Add return to the other compat function.
[ticket/10758] Add periods.
[ticket/10758] Yes, only one empty line.
[ticket/10758] Add deprecated tags.
[ticket/10758] Add compat functions.
[ticket/10758] Admin is not working yet.
[ticket/10758] Test moderator and admin permissions.
[ticket/10758] Check that acl was changed in the test.
[ticket/10758] Extract obtain_user_data for the benefit of tests.
[ticket/10758] Functional test for changing a user's permission.
[ticket/10758] Spelling fix.
[ticket/10758] Add a test for acp login.
[ticket/10758] Dependency inject parameters into update_foes.
[ticket/10758] Dependency inject parameters into cache_moderators.
All extensions are located in the `phpBB/ext` directory,
however the `phpbb_extension_manager::all_available()`
method only looks into actual directories and ignores symlinks.
Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to
the `new RecursiveDirectoryIterator` call so that you can store
extensions in a different location and use symlinks so that
phpBB can recognise them.
PHPBB3-11283
