Merge branch '3.3.x'

Author: marc1706

development/extensions/events_list.rst

@@ -1405,6 +1405,10 @@ Template Events
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | navbar_header_username_prepend                        | navbar_header.html                                       | 3.1.0-RC1        | Add text and HTMl before the username shown in the navbar.                                                                       |
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
+    | notification_dropdown_footer_after                    | notification_dropdown.html                               | 3.3.12           | Add content after notifications list footer.                                                                                     |
+    +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
+    | notification_dropdown_footer_before                   | notification_dropdown.html                               | 3.3.12           | Add content before notifications list footer.                                                                                    |
+    +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | overall_footer_after                                  | overall_footer.html                                      | 3.1.0-a1         | Add content at the end of the file, directly prior to the `</body>` tag                                                          |
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | overall_footer_body_after                             | overall_footer.html                                      | 3.1.3-RC1        | Add content before the `</body>` tag but after the $SCRIPTS var, i.e. after the js scripts have been loaded                      |
@@ -1667,6 +1671,10 @@ Template Events
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | ucp_friend_list_before                                | ucp_zebra_friends.html                                   | 3.1.0-a4         | Add optional elements before list of friends in UCP                                                                              |
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
+    | ucp_group_settings_after                              | ucp_groups_manage.html                                   | 3.3.13-RC1       | Add content after options for managing a group in the UCP                                                                        |
+    +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
+    | ucp_group_settings_before                             | ucp_groups_manage.html                                   | 3.3.13-RC1       | Add content before options for managing a group in the UCP                                                                       |
+    +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | ucp_header_content_before                             | ucp_header.html                                          | 3.3.12-RC1       | Add optional elements before tab panels content in UCP                                                                           |
     +-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
     | ucp_header_friends_offline_username_full_append       | ucp_header.html                                          | 3.2.10-RC1       | Append information to offline friends username in UCP                                                                            |
@@ -2057,6 +2065,12 @@ ACP Template Events
     +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
     | acp_group_types_prepend                        | acp_groups.html            | 3.2.9-RC1        | Add additional group type options to group settings (prepend the list)                                                                        |
     +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+    | acp_groups_add_user_options_after              | acp_groups.html            | 3.3.13-RC1       | Add content after options for adding user to group in the ACP                                                                                 |
+    +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+    | acp_groups_add_user_options_before             | acp_groups.html            | 3.3.13-RC1       | Add content before options for adding user to group in the ACP                                                                                |
+    +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+    | acp_groups_add_user_usernames_before           | acp_groups.html            | 3.3.13-RC1       | Add content before usernames option for adding user to group in the ACP                                                                       |
+    +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
     | acp_groups_find_username_append                | acp_groups.html            | 3.1.7-RC1        | Add content at the end of the find username link                                                                                              |
     +------------------------------------------------+----------------------------+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
     | acp_groups_find_username_prepend               | acp_groups.html            | 3.1.7-RC1        | Add content at the start of the find username link                                                                                            |