Skip to content

Commit

Permalink
Merge branch '3.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@marc1706
marc1706 committed May 12, 2024
2 parents 22f3b01 + 2a88638 commit 5fabfe0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 12 deletions.
14 changes: 14 additions & 0 deletions development/extensions/events_list.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1661,10 +1661,14 @@ Template Events
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_agreement_terms_before | ucp_agreement.html | 3.1.0-b3 | Add content before the terms of agreement text at user registration |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_footer_content_after | ucp_footer.html | 3.3.12-RC1 | Add optional elements after tab panels content in UCP |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_friend_list_after | ucp_zebra_friends.html | 3.1.0-a4 | Add optional elements after list of friends in UCP |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_friend_list_before | ucp_zebra_friends.html | 3.1.0-a4 | Add optional elements before list of friends in 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 |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_header_friends_offline_username_full_prepend | ucp_header.html | 3.2.10-RC1 | Prepend information to offline friends username in UCP |
Expand All @@ -1685,6 +1689,14 @@ Template Events
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_main_subscribed_topic_title_after | ucp_main_subscribed.html | 3.3.8-RC1 | Add content right after the topic title viewing UCP subscribed topics |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_notifications_content_after | ucp_notifications.html | 3.3.12-RC1 | Add optional elements after UCP notification options tab content |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_notifications_content_before | ucp_notifications.html | 3.3.12-RC1 | Add optional elements before UCP notification options tab content |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_notifications_form_after | ucp_notifications.html | 3.3.12-RC1 | Add optional elements after HTMP form in UCP notification options tab |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_notifications_form_before | ucp_notifications.html | 3.3.12-RC1 | Add optional elements before HTMP form in UCP notificationoptions tab |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| ucp_pm_history_post_buttons_after | ucp_pm_history.html | 3.1.6-RC1 | Add post button to private messages in history review (next to quote etc), at |
| | | | the end of the list. |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
Expand Down Expand Up @@ -1864,6 +1876,8 @@ Template Events
| viewtopic_body_footer_before | viewtopic_body.html | 3.1.0-a1 | Add content to the bottom of the View topic screen below the posts |
| | | | and quick reply, directly before the jumpbox in Prosilver. |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| viewtopic_body_online_list_after | viewtopic_body.html | 3.3.12-RC1 | Add content after the online users list |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| viewtopic_body_online_list_before | viewtopic_body.html | 3.2.10-RC1 | Add content before the online users list |
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
| viewtopic_body_pagination_top_after | viewtopic_body.html | 3.1.4-RC1 | Add content after the pagination at top |
Expand Down
6 changes: 3 additions & 3 deletions development/extensions/skeleton_extension.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ In order to create an extension via the CLI, you need to open a console
on your server and ``cd`` to the root directory of the phpBB board where
you installed this extension:

.. code:: bash
.. code:: console
$ cd ./path/to/phpBB
To create an extension, run:

.. code:: bash
.. code:: console
$ ./bin/phpbbcli.php extension:create
Expand Down Expand Up @@ -814,7 +814,7 @@ distribution such as unit tests and hidden Git files.

To run the build script, use the following console commands:

.. code:: bash
.. code:: console
# Navigate to the root of your extension
$ cd ./path/to/phpBB/vendor/package
Expand Down
18 changes: 9 additions & 9 deletions development/extensions/tutorial_key_concepts.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,21 +297,21 @@ is already defined, and if not, then include your script and define the script.

.. code-block:: twig
{% if not $INCLUDED_JQUERYUIJS %}
{% if not definition.INCLUDED_JQUERYUIJS %}
{% INCLUDEJS '@vendor_extname/jquery-ui.js' %}
{% DEFINE $INCLUDED_JQUERYUIJS = true %}
{% DEFINE INCLUDED_JQUERYUIJS = true %}
{% endif %}
Some example template variable definitions to use with common libraries (the common practice should be to name
the variable definition after the library filename, e.g. highslide.js becomes HIGHSLIDEJS):

* HighSlide JS: ``$INCLUDED_HIGHSLIDEJS``
* Font Awesome CSS: ``$INCLUDED_FONTAWESOMECSS``
* ColorBox JS: ``$INCLUDED_COLORBOXJS``
* ColPick JS: ``$INCLUDED_COLPICKJS``
* MoTools JS: ``$INCLUDED_MOTOOLSJS``
* Dojo JS: ``$INCLUDED_DOJOJS``
* Angular JS: ``$INCLUDED_ANGULARJS``
* HighSlide JS: ``INCLUDED_HIGHSLIDEJS``
* Font Awesome CSS: ``INCLUDED_FONTAWESOMECSS``
* ColorBox JS: ``INCLUDED_COLORBOXJS``
* ColPick JS: ``INCLUDED_COLPICKJS``
* MoTools JS: ``INCLUDED_MOTOOLSJS``
* Dojo JS: ``INCLUDED_DOJOJS``
* Angular JS: ``INCLUDED_ANGULARJS``

.. seealso::

Expand Down

0 comments on commit 5fabfe0

Please sign in to comment.