* 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
Add core event to the function display_forums()
in includes/functions_display.php to allow assigning additional template data
for every forum, f.e. additional forumrow subloops.
PHPBB3-12669
* github-nickvergessen/ticket/12273: (55 commits)
[ticket/12273] Move $extension to constructor so the path is always set
[ticket/12273] Find events.md relative from the path not the phpbb root
[ticket/12273] Do not look in extensions docs/ and tests/ directory
[ticket/12273] Also check file for adm "Location:" events
[ticket/12273] Do not allow template events in non-html files
[ticket/12273] Fix return description
[ticket/12273] Update exporter to allow specifying an extension
[ticket/12273] Allow to filter events for extensions
[ticket/12273] Remove old parameter from function call
[ticket/12273] Fix table header for adm events
[ticket/12273] Add root path to recursive_event_filter_iterator
[ticket/12273] Fix missing classes in export_events_for_wiki.php
[ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
[ticket/12273] Use RecursiveDirectoryIterator in md_exporter
[ticket/12273] Fix doc blocks
[ticket/12273] Do not allow 3.1-A1 for template events
[ticket/12273] Sort arguments alphabetically before exporting
[ticket/12273] Do not allow 3.1-A1 version
[ticket/12273] Update since version to 3.1.0-a* style
[ticket/12273] Update existing events
...
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
* vsephpbb/ticket/12060: (37 commits)
[ticket/12060] A little less verbose cleanup of event docblocks
[ticket/12060] Further clarifying new event docblocks as much as possible
[ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
[ticket/12060] Remove whitespaces
[ticket/12060] Fix docblock for acp_bbcodes_modify_create event
[ticket/12060] Rename event in message parser to modify_format_display_text_after
[ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
[ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
[ticket/12060] Use separate template event for acp user signature posting buttons
[ticket/12060] Rename event from append to after in acp_bbcodes.html
[ticket/12060] Correctly label alpha versions in event docblocks
[ticket/12060] Fix u_action comments in docblocks
[ticket/12060] Change @since in event docblocks
[ticket/12060] Update the docblock comments in acp core events
[ticket/12060] Refactor u_action in the events that use it
[ticket/12060] Use $sql_ary instead of $sql
[ticket/12060] Update docblock for core event due to addition of another var
[ticket/12060] Remove re-tabbing of html from subsilver2 files
[ticket/12060] Add $update_this_message var to the core event
[ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
...
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.
PHPBB3-11525
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10411] Fix call to function on non-object $db->...()
[ticket/10411] Remove ajax delete, so the page is refreshed
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[ticket/10411] Update schema file with new table and remove the column
[ticket/10411] Add unit tests for move() with values >1
[ticket/10411] Add migrations file for teampage table
[ticket/10411] Revert database_update.php changes from for easier update
...
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().
PHPBB3-10018
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.
PHPBB3-10018
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
[feature/events] Fix improperly named event in documentation
[feature/events] Fix alphabetization of events
[feature/events] Put events in alphabetical order
[feature/events] Make EVENTS.md lowercase
[ticket/11285] Use more granularity in dependency checks in compress test
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
[ticket/10803] Show failure message until user dismisses it
[ticket/10954] Add missing semi-colon
[ticket/10954] Make sure to mark subforums unread and add small fixes
[feature/events] Use ` to escape HTML tags in markdown
[feature/events] Remove HTML tags from markdown so they don't get parsed
[ticket/10954] Miscellaneous coding fixes
[feature/events] Remove extraneous space
[feature/events] Add markdown template event documentation file
[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
[feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
[feature/events] Fix typo in event name
[ticket/10763] Use self when calling get_extension() in filespec class
[feature/events] Fix more subsilver2 events
[feature/events] Fix some subsilver2 events
...
Conflicts:
phpBB/install/database_update.php
phpBB/posting.php
It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.
PHPBB3-10954
Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.
PHPBB3-10018
