* brunoais/ticket/10575:
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.
PHPBB3-10575
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7, reversing
changes made to 7d6b289671.
PHPBB3-10650
Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.
PHPBB3-10650
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.
PHPBB3-10650
* develop-olympus:
[ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
[ticket/10658] Use get_user_rank() for group ranks on group view.
* bantu/ticket/10658:
[ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
[ticket/10658] Use get_user_rank() for group ranks on group view.
* develop-olympus:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both
PHPBB3-10699
Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.
PHPBB3-10438
* cyberalien/ticket/10665:
[ticket/10665] Adding includejs to acp templates
[ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
[ticket/10665] New test class for templates with tree
[ticket/10665] Changing template->_js_include to public
[ticket/10665] Moving filter parameters to one array
[ticket/10665] INCLUDEJS unit test
[ticket/10665] Changing template compiler test
[ticket/10665] INCLUDEJS template changes
[ticket/10665] INCLUDEJS template tag
Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete
PHPBB3-10665
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments
* cyberalien/ticket/10733:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10733] Adding test for locator
[ticket/10733] Adding functions to locate resources
[ticket/10733] Extending get_source_file_for_handle
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.
PHPBB3-10731
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.
PHPBB3-10731