# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11343] Remove spare parentheses.
[ticket/11343] Remove spare space.
[ticket/11343] Use === when checking stored user_actkey against user input.
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11343:
[ticket/11343] Remove spare parentheses.
[ticket/11343] Remove spare space.
[ticket/11343] Use === when checking stored user_actkey against user input.
* develop-olympus:
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
Conflicts:
.travis.yml
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
* develop-olympus:
[ticket/11295] Drop tables rather than database for postgres in test suite.
Conflicts:
tests/test_framework/phpbb_database_test_connection_manager.php
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11328:
[ticket/11328] Replace long buttons text with short text
[ticket/11328] Add language variables for buttons
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/9492:
[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
# By David Colón
* remotes/DavidIQ/ticket/10786:
[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
Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did.
PHPBB3-10786
Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did.
PHPBB3-10786
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10431:
[ticket/10431] Remove .left class from reply-all
[ticket/10431] Remove reply-all custom css
[ticket/10431] Adjustments for large buttons
[ticket/10431] Changed fonts for Linux
[ticket/10431] Adjustments for IE7
[ticket/10431] Different font for iOS
[ticket/10431] CSS3 buttons
