* develop-olympus:
[ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
Conflicts:
phpBB/styles/prosilver/template/ucp_groups_manage.html
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.
PHPBB3-11538
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
[ticket/11533] Update unit tests
[ticket/11533] Fix colspan and unnecessary tables
[ticket/11533] Change list to table for notification settings
[ticket/11533] Columns counter for notification settings
"You are not subscribed to any forums".
While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections.
As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header.
PHPBB3-11129
We use this title attribute in viewforum_body.html, but not in
search_results.html. Perhaps we should, as this will maintain
consitency between all these topic view pages.
PHPBB3-11463
When a post is being deleted and the user goes to the next page, the first
post of that next page is now on the page before. So the user performing
the action will skip the post. Until we found a good solution to fix this,
we just remove the AJAX from these features.
For more information see http://tracker.phpbb.com/browse/PHPBB3-11340
PHPBB3-9657
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
[ticket/11390] Correctly separate list of notifications from header
[ticket/11390] Hide pagination when there are no notifications
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11408] user_jabber instead of jabber
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
