* develop-ascraeus:
[ticket/12680] Adds variable for guest user
[ticket/12680] Brings back get_username_string()
[ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
[ticket/12680] Still some problems with displaying the nickname in ucp
[ticket/12680] Little changes, but some issues are still there
[ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
[ticket/12680] Adds alternativ text with new variable to contact:
[ticket/12680] Adds second alternativ text and font-size: 0 to remove text
[ticket/12680] Adds alternative text to contact icon in viewtopic.php
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php
* Crizz0/ticket/12680:
[ticket/12680] Adds variable for guest user
[ticket/12680] Brings back get_username_string()
[ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
[ticket/12680] Still some problems with displaying the nickname in ucp
[ticket/12680] Little changes, but some issues are still there
[ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
[ticket/12680] Adds alternativ text with new variable to contact:
[ticket/12680] Adds second alternativ text and font-size: 0 to remove text
[ticket/12680] Adds alternative text to contact icon in viewtopic.php
* develop-ascraeus:
[prep-release-3.1.0-RC1] Update phpBB Version for RC2 development
[prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1
[prep-release-3.1.0-RC1] Prepare Changelog
[prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1
[prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
* develop-ascraeus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
* develop-olympus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.
PHPBB3-12755
* develop-ascraeus:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
The variable $mimetype is not used in the method local_upload() afterwards
so it shouldn't be assigned. The correct default mimetype should be
application/octet-stream and not application/octetstream according to RFC 2046.
PHPBB3-11148
The mimetype guesser will be used to get the mimetype of uploaded files.
Until now, this was only used for files uploaded with plupload. If a file
doesn't have a mimetype supplied, we will now try to get the correct mimetype.
PHPBB3-11148
* develop-ascraeus:
[ticket/12690] Find a space
[ticket/12690] Remove $msg_id and chmod
[ticket/12690] Add other info to core.submit_pm_after
[ticket/12690] Add core.submit_pm_after event
[ticket/12690] Add core.submit_pm_after event
* lucifer4o/ticket/12690:
[ticket/12690] Find a space
[ticket/12690] Remove $msg_id and chmod
[ticket/12690] Add other info to core.submit_pm_after
[ticket/12690] Add core.submit_pm_after event
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
[ticket/12563] Adds « and » to the links in acp_styles.php
[ticket/12563] Removes ending . from <a>
[ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
[ticket/12563] Changes 2 language variables to better understandable names
* develop-ascraeus:
[ticket/12612] Move functions from mcp.php to functions_mcp.php
[ticket/12612] Move function from ucp.php to functions_user.php
[ticket/12612] Move functions from memberlist.php to functions_display.php
[ticket/12612] Move functions from posting.php to functions_posting.php
* github-nickvergessen/ticket/12612-ascraeus:
[ticket/12612] Move functions from mcp.php to functions_mcp.php
[ticket/12612] Move function from ucp.php to functions_user.php
[ticket/12612] Move functions from memberlist.php to functions_display.php
[ticket/12612] Move functions from posting.php to functions_posting.php
[ticket/12747] Drop support for Firebird
* nickvergessen/ticket/12747:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
Conflicts:
phpBB/phpbb/db/driver/firebird.php
[ticket/12704] Improve the load time information in the footer when enabled
* rxu/ticket/12704:
[ticket/12704] Improve the load time information in the footer when enabled
