From 421fc8d94db1b6a89518cbcc3f3141625eefff25 Mon Sep 17 00:00:00 2001 From: Callum Macrae Date: Tue, 10 Apr 2012 11:25:06 +0100 Subject: [ticket/10776] Fixed errors in docs/README.html. PHPBB3-10776 --- phpBB/docs/README.html | 77 +++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index aa60d7dd25..d54b9d920f 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -41,7 +41,7 @@ -

Thank you for downloading phpBB3. This README will guide through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully before proceeding with the installation.

+

Thank you for downloading phpBB3. This README will guide you through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully before proceeding with the installation.

Readme

@@ -62,12 +62,12 @@
  • Getting help with phpBB3
    1. Documentation
    2. -
    3. Community Forums
    4. +
    5. Community forums
    6. Internet Relay Chat
  • Status of this version
  • -
  • Reporting Bugs +
  • Reporting bugs
    1. Security related bugs
    @@ -91,11 +91,11 @@
    -

    Installation, update and conversion instructions can be found in the INSTALL document contained in this distribution. If you are intending to convert from a previous phpBB 2.0.x installation we highly recommend you backup any existing data before proceeding!

    +

    Installation, update and conversion instructions can be found in the INSTALL document in this directory. If you are intending on converting from a phpBB 2.0.x installation we highly recommend that you backup any existing data before proceeding!

    Users of phpBB3 Beta versions cannot directly update.

    -

    Please note that we won't support the following installation types:

    +

    Please note that we don't support the following installation types:

    • Updates from phpBB3 Beta versions to phpBB3 RC1 and higher
    • Conversions from phpBB 2.0.x to phpBB3 Beta versions
    • @@ -107,7 +107,7 @@
      • Updates from phpBB3 RC1 to the latest version
      • Conversions from phpBB 2.0.x to the latest version
      • -
      • New installations of phpBB3 - always only the latest released version
      • +
      • New installations of phpBB3 - only the latest released version
    @@ -134,33 +134,33 @@

    http://www.phpbb.com/downloads/

    -

    This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!

    +

    This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. Please do not ask for support if you download a language pack from a 3rd party site.

    -

    Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the now appeared new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.

    +

    Installation of these packages is straightforward; simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the new language pack, which will have been automatically detected. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset). Again, you must retain the directory structure. Once installed the imageset will immediately become available.

    If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.

    2.ii. Styles

    -

    Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at

    +

    Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows other styles to be used with relative ease. First, you need to locate and download a style you like. We maintain such a site at

    http://www.phpbb.com/styles/

    -

    Please note that 3rd party styles downloaded for versions of phpBB2 will not work in phpBB3.

    +

    Please note that styles for phpBB2 will not work with phpBB3.

    -

    Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles, you should see the new style available, click install and it will become available for all your users.

    +

    Once you have downloaded a style, the next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles. You should see the new style, click install and it will become available for all your users.

    -

    Please note that if you create your own style or modify existing ones, please remember to enable the "Recompile stale style components" setting within the Admin->General->Load Settings screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect.

    +

    Please note that if you create your own style or modify existing ones, you should enable the "Recompile stale style components" setting within the Admin->General->Load Settings screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect without manually refreshing the style components.

    2.iii. Modifications

    -

    Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:

    +

    Although the modifications themselves are not officially supported by phpBB Group, phpBB has a thriving modification scene. These add features to phpBB, and can be found at:

    http://www.phpbb.com/mods/

    -

    Please remember that any bugs or other issues that occur after you have added any modification should NOT be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.

    +

    Please remember that any bugs or other issues that may occur as a result of installing a modification should NOT be reported to the bug tracker (see below). First remove the modification, and then see if that has fixed the problem.

    -

    Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.

    +

    Also remember that any modifications which modify the database in any way may make upgrading your forum to future versions more difficult. However, many users have and continue to utilise many of the mods already available with great success.

    @@ -178,27 +178,27 @@
    -

    phpBB3 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the FAQ which covers a few basic getting started questions. If you need additional help there are several places you should look.

    +

    phpBB3 can sometimes seem a little daunting to new users, particularly with regards to the permission system. The first thing you should do is check the FAQ, which covers a few basic getting started questions. If you need additional help there are several places you can find it.

    3.i. phpBB3 Documentation

    -

    A comprehensive documentation is now available online and can be accessed from the following location:

    +

    Comprehensive documentation is now available on the phpBB website:

    http://www.phpbb.com/support/documentation/3.0/

    -

    This covers everything from installation through setting permissions and managing users.

    +

    This covers everything from installation to setting permissions and managing users.

    3.ii. Community Forums

    -

    phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:

    +

    phpBB Group maintains a thriving community where a number of people generously donate their time to help support users. This site can be found at:

    -

    http://www.phpbb.com/

    +

    http://www.phpbb.com/community/

    -

    If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.

    +

    If you do seek help via our forums please be sure to do a search before posting to make sure; if someone has experienced the issue before, then you may find that your question has already been answered. Please remember that phpBB is entirely staffed by volunteers, no one receives any compensation for the time they give, including moderators as well as developers; please be respectful and mindful when awaiting responses and receiving support.

    3.iii Internet Relay Chat

    -

    Another place you may find help is our IRC channel. This operates on the Freenode IRC network, irc.freenode.net and the channel is #phpbb and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

    +

    Another place you can find help is our IRC channel, which you can find on the Freenode IRC network, irc.freenode.net in #phpbb. It can be accessed by any IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

    @@ -216,13 +216,13 @@
    -

    This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with only point releases seeing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.

    +

    This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with releases only containing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.1, which is currently under development. Please do not post questions asking when any future releases will be released; they will be released when they are finished.

    -

    For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:

    +

    Those interested in the development of phpBB should keep an eye on the forums on the development site, Area51, to see how things are progressing and to help out if you wish:

    http://area51.phpbb.com/phpBB/

    -

    Please note that this forum should NOT be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.

    +

    Please note that these forums should NOT be used to obtain support, as the main community forums are the place for this. Any such posts will be locked and go unanswered.

    @@ -240,20 +240,19 @@
    -

    The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please DO NOT post bug reports to our forums, they will be locked. In addition please DO NOT use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).

    +

    The phpBB Group uses a bug tracking system to manage all reported bugs, which can be found at the location listed below. Please DO NOT post bug reports to our forums, they will be locked. In addition please DO NOT use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).

    http://tracker.phpbb.com/

    While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:

      -
    • Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues

    • -
    • Next please read or search through the existing bug reports to see if your bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).

    • -
    • Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please DO NOT post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3

    • -
    • If no existing bug exists then please feel free to add it
    • +
    • First determine if your bug is reproducible. How to determine this depends on the bug in question. If the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If it cannot, then it is most likely not a bug in phpBB.

    • +
    • Next please read or search through the existing bug reports to see whether we already know about the bug you found. If there is already a ticket, then please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).

    • +
    • If no existing bug exists then please add it
    -

    If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:

    +

    If you do post a new bug, make sure you are logged in (your username and password are the same as for the community forums) then please include the following details in your bug report:

    • Your server type/version, e.g. Apache 1.3.28, IIS 4, Sambar, etc.
    • @@ -263,9 +262,9 @@

      The relevant database type/version is listed within the administration control panel

      -

      Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request on GitHub.

      +

      Please be as detailed as you can in your report, and if possible, list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request to our repository on GitHub.

      -

      Once a bug has been submitted you will be emailed any follow up comments added to it. Please if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.

      +

      Once a bug has been submitted you will be emailed any follow up comments added to it. If you are requested to supply additional information, please do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. If we cannot replicate the bug we may close the ticket, which could leave the bug in phpBB. Obviously we would rather not have this situation arise.

      5.i. Security related bugs

      @@ -289,11 +288,11 @@
      -

      This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.

      +

      This list is by no means complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.

        -
      • Conversions may fail to complete on large boards under some hosts
      • -
      • Updates may fail to complete on large update sets under some hosts
      • +
      • Conversions may fail to complete on large boards under some hosts.
      • +
      • Updates may fail to complete on large update sets under some hosts.
      • Smilies placed directly after bbcode tags will not get parsed. Smilies always need to be separated by spaces.
      @@ -313,9 +312,9 @@
      -

      phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3.

      +

      phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3. The minimum version that will be required for phpBB 3.1 is PHP 5.3.2.

      -

      Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.

      +

      Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

      This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem.

      @@ -339,7 +338,7 @@
      -

      This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

      +

      This application is open source software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright © phpBB Group, All Rights Reserved.

      -- cgit v1.2.1 From 8a2063090c382445835e64fb95ad3aebd777e146 Mon Sep 17 00:00:00 2001 From: Callum Macrae Date: Thu, 12 Apr 2012 20:53:27 +0100 Subject: [ticket/10776] Fixed a couple language changes in docs/README.html. PHPBB3-10776 --- phpBB/docs/README.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index d54b9d920f..0b5709a7c7 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -136,7 +136,7 @@

      This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. Please do not ask for support if you download a language pack from a 3rd party site.

      -

      Installation of these packages is straightforward; simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the new language pack, which will have been automatically detected. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset). Again, you must retain the directory structure. Once installed the imageset will immediately become available.

      +

      Installation of these packages is straightforward; simply download the required language pack and extract it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the new language pack, which will have been automatically detected. To install the style imageset you should download the imageset for your language and extract the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset). Again, you must retain the directory structure. Once installed the imageset will immediately become available.

      If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.

      @@ -148,7 +148,7 @@

      Please note that styles for phpBB2 will not work with phpBB3.

      -

      Once you have downloaded a style, the next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles. You should see the new style, click install and it will become available for all your users.

      +

      Once you have downloaded a style, the next step is to extract (or upload the extracted contents of) the package into your styles/ directory. You then need to visit Administration -> Styles. You should see the new style, click install and it will become available for all your users.

      Please note that if you create your own style or modify existing ones, you should enable the "Recompile stale style components" setting within the Admin->General->Load Settings screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect without manually refreshing the style components.

      @@ -194,7 +194,7 @@

      http://www.phpbb.com/community/

      -

      If you do seek help via our forums please be sure to do a search before posting to make sure; if someone has experienced the issue before, then you may find that your question has already been answered. Please remember that phpBB is entirely staffed by volunteers, no one receives any compensation for the time they give, including moderators as well as developers; please be respectful and mindful when awaiting responses and receiving support.

      +

      If you do seek help via our forums please be sure to do a search before posting; if someone has experienced the issue before, then you may find that your question has already been answered. Please remember that phpBB is entirely staffed by volunteers, no one receives any compensation for the time they give, including moderators as well as developers; please be respectful and mindful when awaiting responses and receiving support.

      3.iii Internet Relay Chat

      -- cgit v1.2.1 From 03d2c6413c25b1faf7f37ff20625ce986b19eb88 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Fri, 7 Dec 2012 21:57:33 -0500 Subject: [ticket/11248] Convert line endings to LF - develop edition. PHPBB3-11248 --- phpBB/docs/sphinx.sample.conf | 90 ++++++++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 30 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index aa0e8d905d..fcaba6dcf3 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -10,21 +10,36 @@ source source_phpbb_{SPHINX_ID}_main sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1 sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 - sql_query = SELECT \ - p.post_id AS id, \ - p.forum_id, \ - p.topic_id, \ - p.poster_id, \ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ - p.post_time, \ - p.post_subject, \ - p.post_subject as title, \ - p.post_text as data, \ - t.topic_last_post_time, \ - 0 as deleted \ - FROM phpbb_posts p, phpbb_topics t \ - WHERE \ - p.topic_id = t.topic_id \ + sql_query = SELECT +\ + p.post_id AS id, +\ + p.forum_id, +\ + p.topic_id, +\ + p.poster_id, +\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, +\ + p.post_time, +\ + p.post_subject, +\ + p.post_subject as title, +\ + p.post_text as data, +\ + t.topic_last_post_time, +\ + 0 as deleted +\ + FROM phpbb_posts p, phpbb_topics t +\ + WHERE +\ + p.topic_id = t.topic_id +\ AND p.post_id >= $start AND p.post_id <= $end sql_query_post = sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 @@ -42,21 +57,36 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { sql_query_range = sql_range_step = - sql_query = SELECT \ - p.post_id AS id, \ - p.forum_id, \ - p.topic_id, \ - p.poster_id, \ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ - p.post_time, \ - p.post_subject, \ - p.post_subject as title, \ - p.post_text as data, \ - t.topic_last_post_time, \ - 0 as deleted \ - FROM phpbb_posts p, phpbb_topics t \ - WHERE \ - p.topic_id = t.topic_id \ + sql_query = SELECT +\ + p.post_id AS id, +\ + p.forum_id, +\ + p.topic_id, +\ + p.poster_id, +\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, +\ + p.post_time, +\ + p.post_subject, +\ + p.post_subject as title, +\ + p.post_text as data, +\ + t.topic_last_post_time, +\ + 0 as deleted +\ + FROM phpbb_posts p, phpbb_topics t +\ + WHERE +\ + p.topic_id = t.topic_id +\ AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) sql_query_pre = } -- cgit v1.2.1 From 52cd0b8a6d2d03dacf81c1ff18e82eab706e85fb Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 17 Dec 2012 18:00:47 -0500 Subject: [feature/events] Add markdown template event documentation file PHPBB3-9550 --- phpBB/docs/EVENTS.md | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 phpBB/docs/EVENTS.md (limited to 'phpBB/docs') diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md new file mode 100644 index 0000000000..10073a98dc --- /dev/null +++ b/phpBB/docs/EVENTS.md @@ -0,0 +1,130 @@ +acp_forums_normal_settings_append +=== +* Location: adm/style/acp_forums.html +* Purpose: Add settings to forums + +acp_main_notice_after +=== +* Location: adm/style/acp_main.html +* Purpose: Add notices or other blocks in the ACP below other configuration notices + +acp_main_actions_append +=== +* Location: adm/style/acp_main.html +* Purpose: Add actions to the ACP main page below the cache purge action + +acp_overall_footer_after +=== +* Location: adm/style/overall_footer.html +* Purpose: Add content below the footer in the ACP + +acp_overall_header_head_append +=== +* Location: adm/style/overall_header.html +* Add assets within the tags in the ACP + +acp_simple_footer_after +=== +* Location: adm/style/simple_footer.html +* Purpose: Add content below the simple footer in the ACP + +acp_simple_header_head_append +=== +* Location: adm/style/overall_header.html +* Add assets within the tags in the simple header of the ACP + +acp_users_overview_options_append +=== +* Location: adm/style/acp_users.html +* Purpose: Add options and settings on user overview page + +forumlist_body_last_post_prepend +==== +* Location: styles/prosilver/template/forumlist_body.html +* Purpose: Add content before the post title of the latest post in a forum on the forum list. + +index_body_stat_blocks_before +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks + +overall_footer_breadcrumb_append +=== +* Location: styles/prosilver/template/overall_footer.html +* Purpose: Add links to the list of breadcrumbs in the footer + +overall_footer_copyright_prepend +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content before the copyright line + +overall_footer_copyright_append +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content after the copyright line (no new line by default), before the ACP link + +overall_footer_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content at the end of the file, directly prior to the tag + +overall_header_head_append +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/overall_header.html +* Purpose: Add asset calls directly before the tag + +overall_header_breadcrumb_append +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/breadcrumbs.html +* Purpose: Add links to the list of breadcrumbs in the header + +overall_header_navigation_prepend +=== +* Location: styles/prosilver/template/overall_header.html +* Purpose: Add links before the navigation links in the header + +overall_header_navigation_append +=== +* Location: styles/prosilver/template/overall_header.html +* Purpose: Add links after the navigation links in the header + +posting_editor_options_prepend +=== +* Locations: + + styles/prosilver/template/posting_editor.html + + styles/prosilver/template/posting_body.html +* Purpose: Add posting options on the posting screen + +simple_footer_after +=== +* Location: styles/prosilver/template/simple_footer.html +* Purpose: Add content directly prior to the tag of the simple footer + +ucp_pm_viewmessage_print_head_append +=== +* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html +* Purpose: Add asset calls directly before the tag of the Print PM screen + +viewtopic_topic_title_prepend +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add content directly before the topic title link on the View topic screen + +viewtopic_print_head_append +=== +* Location: styles/prosilver/template/viewtopic_print.html +* Purpose: Add asset calls directly before the tag of the Print Topic screen -- cgit v1.2.1 From 736b8e44568f98d737c745dd870ff09275c7d106 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 17 Dec 2012 19:16:10 -0500 Subject: [feature/events] Remove HTML tags from markdown so they don't get parsed PHPBB3-9550 --- phpBB/docs/EVENTS.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md index 10073a98dc..5072782198 100644 --- a/phpBB/docs/EVENTS.md +++ b/phpBB/docs/EVENTS.md @@ -21,7 +21,7 @@ acp_overall_footer_after acp_overall_header_head_append === * Location: adm/style/overall_header.html -* Add assets within the tags in the ACP +* Add assets within the head tags in the ACP acp_simple_footer_after === @@ -31,7 +31,7 @@ acp_simple_footer_after acp_simple_header_head_append === * Location: adm/style/overall_header.html -* Add assets within the tags in the simple header of the ACP +* Add assets within the head tags in the simple header of the ACP acp_users_overview_options_append === @@ -74,14 +74,14 @@ overall_footer_after * Locations: + styles/prosilver/template/overall_footer.html + styles/subsilver2/template/overall_footer.html -* Purpose: Add content at the end of the file, directly prior to the tag +* Purpose: Add content at the end of the file, directly prior to the closing body tag overall_header_head_append === * Locations: + styles/prosilver/template/overall_header.html + styles/subsilver2/template/overall_header.html -* Purpose: Add asset calls directly before the tag +* Purpose: Add asset calls directly before the closing head tag overall_header_breadcrumb_append === @@ -110,12 +110,12 @@ posting_editor_options_prepend simple_footer_after === * Location: styles/prosilver/template/simple_footer.html -* Purpose: Add content directly prior to the tag of the simple footer +* Purpose: Add content directly prior to the closing body tag of the simple footer ucp_pm_viewmessage_print_head_append === * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html -* Purpose: Add asset calls directly before the tag of the Print PM screen +* Purpose: Add asset calls directly before the closing head tag of the Print PM screen viewtopic_topic_title_prepend === @@ -127,4 +127,4 @@ viewtopic_topic_title_prepend viewtopic_print_head_append === * Location: styles/prosilver/template/viewtopic_print.html -* Purpose: Add asset calls directly before the tag of the Print Topic screen +* Purpose: Add asset calls directly before the closing head tag of the Print Topic screen -- cgit v1.2.1 From a740ae9c22193d9781a7771cfd633aaeb5fa6f82 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 17 Dec 2012 19:44:30 -0500 Subject: [feature/events] Use ` to escape HTML tags in markdown PHPBB3-9550 --- phpBB/docs/EVENTS.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md index 5072782198..cc03688d0d 100644 --- a/phpBB/docs/EVENTS.md +++ b/phpBB/docs/EVENTS.md @@ -21,7 +21,7 @@ acp_overall_footer_after acp_overall_header_head_append === * Location: adm/style/overall_header.html -* Add assets within the head tags in the ACP +* Add assets within the `` tags in the ACP acp_simple_footer_after === @@ -31,7 +31,7 @@ acp_simple_footer_after acp_simple_header_head_append === * Location: adm/style/overall_header.html -* Add assets within the head tags in the simple header of the ACP +* Add assets within the `` tags in the simple header of the ACP acp_users_overview_options_append === @@ -74,14 +74,14 @@ overall_footer_after * Locations: + styles/prosilver/template/overall_footer.html + styles/subsilver2/template/overall_footer.html -* Purpose: Add content at the end of the file, directly prior to the closing body tag +* Purpose: Add content at the end of the file, directly prior to the `` tag overall_header_head_append === * Locations: + styles/prosilver/template/overall_header.html + styles/subsilver2/template/overall_header.html -* Purpose: Add asset calls directly before the closing head tag +* Purpose: Add asset calls directly before the `` tag overall_header_breadcrumb_append === @@ -110,12 +110,12 @@ posting_editor_options_prepend simple_footer_after === * Location: styles/prosilver/template/simple_footer.html -* Purpose: Add content directly prior to the closing body tag of the simple footer +* Purpose: Add content directly prior to the `` tag of the simple footer ucp_pm_viewmessage_print_head_append === * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html -* Purpose: Add asset calls directly before the closing head tag of the Print PM screen +* Purpose: Add asset calls directly before the `` tag of the Print PM screen viewtopic_topic_title_prepend === @@ -127,4 +127,4 @@ viewtopic_topic_title_prepend viewtopic_print_head_append === * Location: styles/prosilver/template/viewtopic_print.html -* Purpose: Add asset calls directly before the closing head tag of the Print Topic screen +* Purpose: Add asset calls directly before the `` tag of the Print Topic screen -- cgit v1.2.1 From 7fa3405cd106da529170c34c889ab6f1511e3e6d Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 20 Dec 2012 14:39:07 -0500 Subject: [feature/events] Make EVENTS.md lowercase PHPBB3-9550 --- phpBB/docs/EVENTS.md | 130 --------------------------------------------------- phpBB/docs/events.md | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 phpBB/docs/EVENTS.md create mode 100644 phpBB/docs/events.md (limited to 'phpBB/docs') diff --git a/phpBB/docs/EVENTS.md b/phpBB/docs/EVENTS.md deleted file mode 100644 index cc03688d0d..0000000000 --- a/phpBB/docs/EVENTS.md +++ /dev/null @@ -1,130 +0,0 @@ -acp_forums_normal_settings_append -=== -* Location: adm/style/acp_forums.html -* Purpose: Add settings to forums - -acp_main_notice_after -=== -* Location: adm/style/acp_main.html -* Purpose: Add notices or other blocks in the ACP below other configuration notices - -acp_main_actions_append -=== -* Location: adm/style/acp_main.html -* Purpose: Add actions to the ACP main page below the cache purge action - -acp_overall_footer_after -=== -* Location: adm/style/overall_footer.html -* Purpose: Add content below the footer in the ACP - -acp_overall_header_head_append -=== -* Location: adm/style/overall_header.html -* Add assets within the `` tags in the ACP - -acp_simple_footer_after -=== -* Location: adm/style/simple_footer.html -* Purpose: Add content below the simple footer in the ACP - -acp_simple_header_head_append -=== -* Location: adm/style/overall_header.html -* Add assets within the `` tags in the simple header of the ACP - -acp_users_overview_options_append -=== -* Location: adm/style/acp_users.html -* Purpose: Add options and settings on user overview page - -forumlist_body_last_post_prepend -==== -* Location: styles/prosilver/template/forumlist_body.html -* Purpose: Add content before the post title of the latest post in a forum on the forum list. - -index_body_stat_blocks_before -=== -* Locations: - + styles/prosilver/template/index_body.html - + styles/subsilver2/template/index_body.html -* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks - -overall_footer_breadcrumb_append -=== -* Location: styles/prosilver/template/overall_footer.html -* Purpose: Add links to the list of breadcrumbs in the footer - -overall_footer_copyright_prepend -=== -* Locations: - + styles/prosilver/template/overall_footer.html - + styles/subsilver2/template/overall_footer.html -* Purpose: Add content before the copyright line - -overall_footer_copyright_append -=== -* Locations: - + styles/prosilver/template/overall_footer.html - + styles/subsilver2/template/overall_footer.html -* Purpose: Add content after the copyright line (no new line by default), before the ACP link - -overall_footer_after -=== -* Locations: - + styles/prosilver/template/overall_footer.html - + styles/subsilver2/template/overall_footer.html -* Purpose: Add content at the end of the file, directly prior to the `` tag - -overall_header_head_append -=== -* Locations: - + styles/prosilver/template/overall_header.html - + styles/subsilver2/template/overall_header.html -* Purpose: Add asset calls directly before the `` tag - -overall_header_breadcrumb_append -=== -* Locations: - + styles/prosilver/template/overall_header.html - + styles/subsilver2/template/breadcrumbs.html -* Purpose: Add links to the list of breadcrumbs in the header - -overall_header_navigation_prepend -=== -* Location: styles/prosilver/template/overall_header.html -* Purpose: Add links before the navigation links in the header - -overall_header_navigation_append -=== -* Location: styles/prosilver/template/overall_header.html -* Purpose: Add links after the navigation links in the header - -posting_editor_options_prepend -=== -* Locations: - + styles/prosilver/template/posting_editor.html - + styles/prosilver/template/posting_body.html -* Purpose: Add posting options on the posting screen - -simple_footer_after -=== -* Location: styles/prosilver/template/simple_footer.html -* Purpose: Add content directly prior to the `` tag of the simple footer - -ucp_pm_viewmessage_print_head_append -=== -* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html -* Purpose: Add asset calls directly before the `` tag of the Print PM screen - -viewtopic_topic_title_prepend -=== -* Locations: - + styles/prosilver/template/viewtopic_body.html - + styles/subsilver2/template/viewtopic_body.html -* Purpose: Add content directly before the topic title link on the View topic screen - -viewtopic_print_head_append -=== -* Location: styles/prosilver/template/viewtopic_print.html -* Purpose: Add asset calls directly before the `` tag of the Print Topic screen diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md new file mode 100644 index 0000000000..cc03688d0d --- /dev/null +++ b/phpBB/docs/events.md @@ -0,0 +1,130 @@ +acp_forums_normal_settings_append +=== +* Location: adm/style/acp_forums.html +* Purpose: Add settings to forums + +acp_main_notice_after +=== +* Location: adm/style/acp_main.html +* Purpose: Add notices or other blocks in the ACP below other configuration notices + +acp_main_actions_append +=== +* Location: adm/style/acp_main.html +* Purpose: Add actions to the ACP main page below the cache purge action + +acp_overall_footer_after +=== +* Location: adm/style/overall_footer.html +* Purpose: Add content below the footer in the ACP + +acp_overall_header_head_append +=== +* Location: adm/style/overall_header.html +* Add assets within the `` tags in the ACP + +acp_simple_footer_after +=== +* Location: adm/style/simple_footer.html +* Purpose: Add content below the simple footer in the ACP + +acp_simple_header_head_append +=== +* Location: adm/style/overall_header.html +* Add assets within the `` tags in the simple header of the ACP + +acp_users_overview_options_append +=== +* Location: adm/style/acp_users.html +* Purpose: Add options and settings on user overview page + +forumlist_body_last_post_prepend +==== +* Location: styles/prosilver/template/forumlist_body.html +* Purpose: Add content before the post title of the latest post in a forum on the forum list. + +index_body_stat_blocks_before +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks + +overall_footer_breadcrumb_append +=== +* Location: styles/prosilver/template/overall_footer.html +* Purpose: Add links to the list of breadcrumbs in the footer + +overall_footer_copyright_prepend +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content before the copyright line + +overall_footer_copyright_append +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content after the copyright line (no new line by default), before the ACP link + +overall_footer_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content at the end of the file, directly prior to the `` tag + +overall_header_head_append +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/overall_header.html +* Purpose: Add asset calls directly before the `` tag + +overall_header_breadcrumb_append +=== +* Locations: + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/breadcrumbs.html +* Purpose: Add links to the list of breadcrumbs in the header + +overall_header_navigation_prepend +=== +* Location: styles/prosilver/template/overall_header.html +* Purpose: Add links before the navigation links in the header + +overall_header_navigation_append +=== +* Location: styles/prosilver/template/overall_header.html +* Purpose: Add links after the navigation links in the header + +posting_editor_options_prepend +=== +* Locations: + + styles/prosilver/template/posting_editor.html + + styles/prosilver/template/posting_body.html +* Purpose: Add posting options on the posting screen + +simple_footer_after +=== +* Location: styles/prosilver/template/simple_footer.html +* Purpose: Add content directly prior to the `` tag of the simple footer + +ucp_pm_viewmessage_print_head_append +=== +* Location: styles/prosilver/template/ucp_pm_viewmessage_print.html +* Purpose: Add asset calls directly before the `` tag of the Print PM screen + +viewtopic_topic_title_prepend +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add content directly before the topic title link on the View topic screen + +viewtopic_print_head_append +=== +* Location: styles/prosilver/template/viewtopic_print.html +* Purpose: Add asset calls directly before the `` tag of the Print Topic screen -- cgit v1.2.1 From 3504e761a3840d9f5281fede517220c22c573e15 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 20 Dec 2012 14:41:55 -0500 Subject: [feature/events] Put events in alphabetical order PHPBB3-9550 --- phpBB/docs/events.md | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index cc03688d0d..cf967fe191 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -50,31 +50,38 @@ index_body_stat_blocks_before + styles/subsilver2/template/index_body.html * Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks +overall_footer_after +=== +* Locations: + + styles/prosilver/template/overall_footer.html + + styles/subsilver2/template/overall_footer.html +* Purpose: Add content at the end of the file, directly prior to the `` tag + overall_footer_breadcrumb_append === * Location: styles/prosilver/template/overall_footer.html * Purpose: Add links to the list of breadcrumbs in the footer -overall_footer_copyright_prepend +overall_footer_copyright_append === * Locations: + styles/prosilver/template/overall_footer.html + styles/subsilver2/template/overall_footer.html -* Purpose: Add content before the copyright line +* Purpose: Add content after the copyright line (no new line by default), before the ACP link -overall_footer_copyright_append +overall_footer_copyright_prepend === * Locations: + styles/prosilver/template/overall_footer.html + styles/subsilver2/template/overall_footer.html -* Purpose: Add content after the copyright line (no new line by default), before the ACP link +* Purpose: Add content before the copyright line -overall_footer_after +overall_header_breadcrumb_append === * Locations: - + styles/prosilver/template/overall_footer.html - + styles/subsilver2/template/overall_footer.html -* Purpose: Add content at the end of the file, directly prior to the `` tag + + styles/prosilver/template/overall_header.html + + styles/subsilver2/template/breadcrumbs.html +* Purpose: Add links to the list of breadcrumbs in the header overall_header_head_append === @@ -83,23 +90,16 @@ overall_header_head_append + styles/subsilver2/template/overall_header.html * Purpose: Add asset calls directly before the `` tag -overall_header_breadcrumb_append +overall_header_navigation_append === -* Locations: - + styles/prosilver/template/overall_header.html - + styles/subsilver2/template/breadcrumbs.html -* Purpose: Add links to the list of breadcrumbs in the header +* Location: styles/prosilver/template/overall_header.html +* Purpose: Add links after the navigation links in the header overall_header_navigation_prepend === * Location: styles/prosilver/template/overall_header.html * Purpose: Add links before the navigation links in the header -overall_header_navigation_append -=== -* Location: styles/prosilver/template/overall_header.html -* Purpose: Add links after the navigation links in the header - posting_editor_options_prepend === * Locations: @@ -117,14 +117,14 @@ ucp_pm_viewmessage_print_head_append * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html * Purpose: Add asset calls directly before the `` tag of the Print PM screen +viewtopic_print_head_append +=== +* Location: styles/prosilver/template/viewtopic_print.html +* Purpose: Add asset calls directly before the `` tag of the Print Topic screen + viewtopic_topic_title_prepend === * Locations: + styles/prosilver/template/viewtopic_body.html + styles/subsilver2/template/viewtopic_body.html * Purpose: Add content directly before the topic title link on the View topic screen - -viewtopic_print_head_append -=== -* Location: styles/prosilver/template/viewtopic_print.html -* Purpose: Add asset calls directly before the `` tag of the Print Topic screen -- cgit v1.2.1 From c7618ff669f31945948358ff8fb6277b6b950c27 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 20 Dec 2012 14:46:00 -0500 Subject: [feature/events] Fix alphabetization of events PHPBB3-9550 --- phpBB/docs/events.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index cf967fe191..2e757d9aca 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -3,15 +3,15 @@ acp_forums_normal_settings_append * Location: adm/style/acp_forums.html * Purpose: Add settings to forums -acp_main_notice_after +acp_main_actions_append === * Location: adm/style/acp_main.html -* Purpose: Add notices or other blocks in the ACP below other configuration notices +* Purpose: Add actions to the ACP main page below the cache purge action -acp_main_actions_append +acp_main_notice_after === * Location: adm/style/acp_main.html -* Purpose: Add actions to the ACP main page below the cache purge action +* Purpose: Add notices or other blocks in the ACP below other configuration notices acp_overall_footer_after === -- cgit v1.2.1 From 00c61f9060de5665a9ef09b88701ad21b94ce51c Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 20 Dec 2012 15:03:45 -0500 Subject: [feature/events] Fix improperly named event in documentation PHPBB3-9550 --- phpBB/docs/events.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 2e757d9aca..f0b3b81822 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -38,9 +38,11 @@ acp_users_overview_options_append * Location: adm/style/acp_users.html * Purpose: Add options and settings on user overview page -forumlist_body_last_post_prepend +forumlist_body_last_post_title_prepend ==== -* Location: styles/prosilver/template/forumlist_body.html +* Locations: + + styles/prosilver/template/forumlist_body.html + + styles/subsilver2/template/forumlist_body.html * Purpose: Add content before the post title of the latest post in a forum on the forum list. index_body_stat_blocks_before -- cgit v1.2.1 From a89ed49cbf797ecc82a70f6a36a06e9c0c396ce1 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 20 Dec 2012 16:40:53 -0500 Subject: [ticket/11287] Add template event naming to docs/coding-guidelines.html PHPBB3-11287 --- phpBB/docs/coding-guidelines.html | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index eb569d12d5..14c2281323 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -72,6 +72,7 @@
      1. General Templating
      2. Styles Tree
      3. +
      4. Template Events
    • Character Sets and Encodings
    • Translation (i18n/L10n) Guidelines @@ -1678,6 +1679,57 @@ version = 3.1.0 parent = prosilver
    • +

      4.iii. Template Events

      +

      Template events must follow this format: <!-- EVENT event_name -->

      +

      Using the above example, files named event_name.html located within extensions will be injected into the location of the event.

      + +

      Template event naming guidelines:

      +
        +
      • An event name must be all lowercase, with each word separated by an underscore.
      • +
      • An event name must briefly describe the location and purpose of the event.
      • +
      • An event name must end with one of the following suffixes:
      • +
          +
        • _prepend - This event adds an item to the beginning of a block of related items, or adds to the beginning of individual items in a block.
        • +
        • _append - This event adds an item to the end of a block of related items, or adds to the end of individual items in a block.
        • +
        • _before - This event adds content directly before the specified block
        • +
        • _after - This event adds content directly after the specified block
        • +
        +
      + +

      Template event documentation

      +

      Events must be documented in phpBB/docs/events.md in alphabetical order based on the event name. The format is as follows:

      + +
      • An event found in only one template file: +
        event_name
        +===
        +* Location: styles/<style_name>/template/filename.html
        +* Purpose: A brief description of what this event should be used for.
        +This may span multiple lines.
        +
      • +
      • An event found in multiple template files: +
        event_name
        +===
        +* Locations:
        +    + first/file/path.html
        +    + second/file/path.html
        +* Purpose: Same as above.
        +
        +
      • An event that is found multiple times in a file should have the number of instances in parenthesis next to the filename. +
        event_name
        +===
        +* Locations:
        +    + first/file/path.html (2)
        +    + second/file/path.html
        +* Purpose: Same as above.
        +
      • +
      • An actual example event documentation: +
        forumlist_body_last_post_title_prepend
        +====
        +* Locations:
        +    + styles/prosilver/template/forumlist_body.html
        +    + styles/subsilver2/template/forumlist_body.html
        +* Purpose: Add content before the post title of the latest post in a forum on the forum list.

      +
      -- cgit v1.2.1 From c4f8c64a2334957757683aa2f65f51d25f359292 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 24 Feb 2013 12:37:02 +0100 Subject: [ticket/11122] Add EXreaction to docs/AUTHORS. PHPBB3-11122 --- phpBB/docs/AUTHORS | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index c623bbb988..28d3548d0b 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,6 +23,7 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) + EXreaction (Nathan Guse) igorw (Igor Wiedler) imkingdavid (David King) nickvergessen (Joas Schilling) -- cgit v1.2.1 From c69b1c2ef24faa74a6b44ccdc19495419bc15131 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 24 Feb 2013 12:43:31 +0100 Subject: [ticket/11122] Move rxu to 'Former Contributors' section. PHPBB3-11122 --- phpBB/docs/AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 28d3548d0b..fcef26daa1 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -28,7 +28,6 @@ phpBB Developers: bantu (Andreas Fischer) imkingdavid (David King) nickvergessen (Joas Schilling) Oleg (Oleg Pudeyev) - rxu (Ruslan Uzdenov) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) @@ -54,6 +53,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] dhn (Dominik Dröscher) [05/2007 - 01/2011] GrahamJE (Graham Eames) [09/2005 - 11/2006] kellanved (Henry Sudhof) [04/2007 - 03/2011] + rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] ToonArmy (Chris Smith) [06/2008 - 11/2011] Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009] -- cgit v1.2.1 From d41cf293e1609be9d0cc08e5ccd37947481e61ca Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 14 Mar 2013 12:10:07 +0100 Subject: [ticket/9657] Check for post visibility when searching with Sphinx This update will require admins to manually update their Sphinx config file aswell as to delete the index and rebuild it from scratch. Before this is done the search will not be usable anymore. PHPBB3-9657 --- phpBB/docs/sphinx.sample.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index fcaba6dcf3..179f06b2e5 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -19,6 +19,8 @@ source source_phpbb_{SPHINX_ID}_main p.topic_id, \ p.poster_id, +\ + p.post_visibility, \ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ @@ -47,6 +49,7 @@ source source_phpbb_{SPHINX_ID}_main sql_attr_uint = forum_id sql_attr_uint = topic_id sql_attr_uint = poster_id + sql_attr_uint = post_visibility sql_attr_bool = topic_first_post sql_attr_bool = deleted sql_attr_timestamp = post_time @@ -66,6 +69,8 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main p.topic_id, \ p.poster_id, +\ + p.post_visibility, \ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ -- cgit v1.2.1 From dc7afd05ebc91c2b1e1f7d58db42997b578c0019 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 Mar 2013 08:06:45 +0100 Subject: [ticket/11438] Update sphinx.sample.conf to one provided by config_generate() PHPBB3-11438 --- phpBB/docs/sphinx.sample.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index fcaba6dcf3..ba1301942a 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -7,7 +7,7 @@ source source_phpbb_{SPHINX_ID}_main sql_db = db_name sql_port = 3306 #optional, default is 3306 for mysql and 5432 for pgsql sql_query_pre = SET NAMES 'utf8' - sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1 + sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 sql_query = SELECT -- cgit v1.2.1 From 8fe776dff75497f77a7cd35ebae0db063c2ca769 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 Mar 2013 08:16:37 +0100 Subject: [ticket/11438] Move backslash to concatenate the query strings correctly Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88 PHPBB3-11438 --- phpBB/docs/sphinx.sample.conf | 90 +++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 60 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index ba1301942a..cb19d011e3 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -10,36 +10,21 @@ source source_phpbb_{SPHINX_ID}_main sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 - sql_query = SELECT -\ - p.post_id AS id, -\ - p.forum_id, -\ - p.topic_id, -\ - p.poster_id, -\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, -\ - p.post_time, -\ - p.post_subject, -\ - p.post_subject as title, -\ - p.post_text as data, -\ - t.topic_last_post_time, -\ - 0 as deleted -\ - FROM phpbb_posts p, phpbb_topics t -\ - WHERE -\ - p.topic_id = t.topic_id -\ + sql_query = SELECT\ + p.post_id AS id,\ + p.forum_id,\ + p.topic_id,\ + p.poster_id,\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ + p.post_time,\ + p.post_subject,\ + p.post_subject as title,\ + p.post_text as data,\ + t.topic_last_post_time,\ + 0 as deleted\ + FROM phpbb_posts p, phpbb_topics t\ + WHERE\ + p.topic_id = t.topic_id\ AND p.post_id >= $start AND p.post_id <= $end sql_query_post = sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 @@ -57,36 +42,21 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { sql_query_range = sql_range_step = - sql_query = SELECT -\ - p.post_id AS id, -\ - p.forum_id, -\ - p.topic_id, -\ - p.poster_id, -\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, -\ - p.post_time, -\ - p.post_subject, -\ - p.post_subject as title, -\ - p.post_text as data, -\ - t.topic_last_post_time, -\ - 0 as deleted -\ - FROM phpbb_posts p, phpbb_topics t -\ - WHERE -\ - p.topic_id = t.topic_id -\ + sql_query = SELECT\ + p.post_id AS id,\ + p.forum_id,\ + p.topic_id,\ + p.poster_id,\ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ + p.post_time,\ + p.post_subject,\ + p.post_subject as title,\ + p.post_text as data,\ + t.topic_last_post_time,\ + 0 as deleted\ + FROM phpbb_posts p, phpbb_topics t\ + WHERE\ + p.topic_id = t.topic_id\ AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) sql_query_pre = } -- cgit v1.2.1 From ef63c2db8b55b37e9e111eb622894332760611a3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 Mar 2013 08:19:50 +0100 Subject: [ticket/11438] Add empty sql_query_pre to delta-source PHPBB3-11438 --- phpBB/docs/sphinx.sample.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index cb19d011e3..5da4ea78df 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -40,6 +40,7 @@ source source_phpbb_{SPHINX_ID}_main } source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { + sql_query_pre = sql_query_range = sql_range_step = sql_query = SELECT\ -- cgit v1.2.1 From c50af280770a9db13043a41e34238a2434176936 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 16 Mar 2013 01:18:15 +0100 Subject: [ticket/11438] Add spaces after # comment start and before \ line breaks PHPBB3-11438 --- phpBB/docs/sphinx.sample.conf | 68 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index 5da4ea78df..d1b98d6cbc 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -1,31 +1,31 @@ source source_phpbb_{SPHINX_ID}_main { - type = mysql #mysql or pgsql - sql_host = localhost #SQL server host sphinx connects to + type = mysql # mysql or pgsql + sql_host = localhost # SQL server host sphinx connects to sql_user = username sql_pass = password sql_db = db_name - sql_port = 3306 #optional, default is 3306 for mysql and 5432 for pgsql + sql_port = 3306 # optional, default is 3306 for mysql and 5432 for pgsql sql_query_pre = SET NAMES 'utf8' sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 - sql_query = SELECT\ - p.post_id AS id,\ - p.forum_id,\ - p.topic_id,\ - p.poster_id,\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ - p.post_time,\ - p.post_subject,\ - p.post_subject as title,\ - p.post_text as data,\ - t.topic_last_post_time,\ + sql_query = SELECT \ + p.post_id AS id, \ + p.forum_id, \ + p.topic_id, \ + p.poster_id, \ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ + p.post_time, \ + p.post_subject, \ + p.post_subject as title, \ + p.post_text as data, \ + t.topic_last_post_time, \ 0 as deleted\ - FROM phpbb_posts p, phpbb_topics t\ - WHERE\ - p.topic_id = t.topic_id\ - AND p.post_id >= $start AND p.post_id <= $end + FROM phpbb_posts p, phpbb_topics t \ + WHERE \ + p.topic_id = t.topic_id \ + AND p.post_id >= $start AND p.post_id <= $end sql_query_post = sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id @@ -43,22 +43,22 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main sql_query_pre = sql_query_range = sql_range_step = - sql_query = SELECT\ - p.post_id AS id,\ - p.forum_id,\ - p.topic_id,\ - p.poster_id,\ - CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ - p.post_time,\ - p.post_subject,\ - p.post_subject as title,\ - p.post_text as data,\ - t.topic_last_post_time,\ - 0 as deleted\ - FROM phpbb_posts p, phpbb_topics t\ - WHERE\ - p.topic_id = t.topic_id\ - AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) + sql_query = SELECT \ + p.post_id AS id, \ + p.forum_id, \ + p.topic_id, \ + p.poster_id, \ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ + p.post_time, \ + p.post_subject, \ + p.post_subject as title, \ + p.post_text as data, \ + t.topic_last_post_time, \ + 0 as deleted \ + FROM phpbb_posts p, phpbb_topics t \ + WHERE \ + p.topic_id = t.topic_id \ + AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) sql_query_pre = } index index_phpbb_{SPHINX_ID}_main -- cgit v1.2.1 From c9da6c5952e95791602d91465af238896abb1bb5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 14 Mar 2013 22:18:34 -0700 Subject: [ticket/11461] Add viewtopic_body_footer_before to the event docs PHPBB3-11461 --- phpBB/docs/events.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index f0b3b81822..7666fcda48 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -124,6 +124,13 @@ viewtopic_print_head_append * Location: styles/prosilver/template/viewtopic_print.html * Purpose: Add asset calls directly before the `` tag of the Print Topic screen +viewtopic_body_footer_before +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add content to the bottom of the viewtopic page after all posts and pagination links + viewtopic_topic_title_prepend === * Locations: -- cgit v1.2.1 From 578ed03b7eb93fe00e67fc83db04b45fadc0fc74 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 15 Mar 2013 00:41:21 -0700 Subject: [ticket/11461] Further clarify doc for viewtopic_body_footer_before PHPBB3-11461 --- phpBB/docs/events.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 7666fcda48..041e2f2ad6 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -129,7 +129,7 @@ viewtopic_body_footer_before * Locations: + styles/prosilver/template/viewtopic_body.html + styles/subsilver2/template/viewtopic_body.html -* Purpose: Add content to the bottom of the viewtopic page after all posts and pagination links +* Purpose: Add content to the bottom of the View topic screen below the posts and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in Subsilver2. viewtopic_topic_title_prepend === -- cgit v1.2.1 From 3089f5d0bbccd923b41264412682978a0c21e313 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 15 Mar 2013 09:24:37 -0700 Subject: [ticket/11461] cut doc entry to 79 cols PHPBB3-11461 --- phpBB/docs/events.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 041e2f2ad6..3723bf7b3f 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -129,7 +129,9 @@ viewtopic_body_footer_before * Locations: + styles/prosilver/template/viewtopic_body.html + styles/subsilver2/template/viewtopic_body.html -* Purpose: Add content to the bottom of the View topic screen below the posts and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in Subsilver2. +* Purpose: Add content to the bottom of the View topic screen below the posts +and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in +Subsilver2. viewtopic_topic_title_prepend === -- cgit v1.2.1 From 6d4a75b3cb9a403d37fe3ac7b3eda5e9c65ad9e0 Mon Sep 17 00:00:00 2001 From: hjpotter92 Date: Thu, 2 May 2013 06:29:32 +0530 Subject: [ticket/11517] Fix list numbering PHPBB3-11517 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index cd113a7226..54b8526cdf 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2314,7 +2314,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
      -

      8. Copyright and disclaimer

      +

      7. Copyright and disclaimer

      -- cgit v1.2.1 From 828d3b6b68acad606fe150cff7993c216ebc4474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Sun, 21 Apr 2013 14:22:45 +0200 Subject: [ticket/11144] Add missing {FORUM_NAME} variable The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144 --- phpBB/docs/coding-guidelines.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index cd113a7226..38f11534d2 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -956,6 +956,8 @@ $action_ary = request_var('action', array('' => 0));

      Login checks/redirection:

      To show a forum login box use login_forum_box($forum_data), else use the login_box() function.

      +

      $forum_data should contain at least the forum_id and forum_password fields. If the field forum_name is available, then it is displayed on the forum login page.

      +

      The login_box() function can have a redirect as the first parameter. As a thumb of rule, specify an empty string if you want to redirect to the users current location, else do not add the $SID to the redirect string (for example within the ucp/login we redirect to the board index because else the user would be redirected to the login screen).

      Sensitive Operations:

      -- cgit v1.2.1 From cb62b37bce2201ec1f0dbdbaa5945f285ad7d6d1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 3 Jun 2013 11:06:12 +0200 Subject: [ticket/11122] Remove Oleg and igorw from active authors PHPBB3-11122 --- phpBB/docs/AUTHORS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index fcef26daa1..a4d421b6ce 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -24,10 +24,8 @@ phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) EXreaction (Nathan Guse) - igorw (Igor Wiedler) imkingdavid (David King) nickvergessen (Joas Schilling) - Oleg (Oleg Pudeyev) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) @@ -53,6 +51,8 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] dhn (Dominik Dröscher) [05/2007 - 01/2011] GrahamJE (Graham Eames) [09/2005 - 11/2006] kellanved (Henry Sudhof) [04/2007 - 03/2011] + igorw (Igor Wiedler) [08/2010 - 02/2013] + Oleg (Oleg Pudeyev) [01/2011 - 05/2013] rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] ToonArmy (Chris Smith) [06/2008 - 11/2011] -- cgit v1.2.1 From 323bfbc78f379624f133e0027d9dfef8513c8cf5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 3 Jun 2013 11:08:50 +0200 Subject: [ticket/11122] Add dhruv to active authors PHPBB3-11122 --- phpBB/docs/AUTHORS | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index a4d421b6ce..5995bd2ab4 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -24,6 +24,7 @@ phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) EXreaction (Nathan Guse) + dhruv.goel92 (Dhruv Goel) imkingdavid (David King) nickvergessen (Joas Schilling) -- cgit v1.2.1 From 6cbb2d6136dc702e8d07eb53b24a026238768841 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 21 Jun 2013 18:24:06 +0530 Subject: [ticket/10776] update min php version 5.3.3 in readme PHPBB3-10776 --- phpBB/docs/README.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index bf72ce1d1f..81ce736df7 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -325,7 +325,7 @@
      -

      phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3. The minimum version that will be required for phpBB 3.1 is PHP 5.3.2.

      +

      phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3. The minimum version that will be required for phpBB 3.1 is PHP 5.3.3.

      Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

      -- cgit v1.2.1 From 6f14c8375eac4f574182980c45919de439a58df5 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 12 Jul 2013 00:39:35 +0200 Subject: [develop-olympus] Bumping version numbers to final for 3.0.12 releases. --- phpBB/docs/INSTALL.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index dcc21fac54..cd1185644b 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -275,7 +275,7 @@

      This package is meant for those wanting to only replace the files that were changed between a previous version and the latest version.

      -

      This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.10 you should select the appropriate phpBB-3.0.11-files.zip/tar.bz2 file.

      +

      This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.11 you should select the appropriate phpBB-3.0.12-files.zip/tar.bz2 file.

      The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

      @@ -287,7 +287,7 @@

      The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the recommended update method.

      -

      A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.10, you need the phpBB-3.0.11-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

      +

      A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.11, you need the phpBB-3.0.12-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

      If you do get failures, you should look at using the Changed Files package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

      @@ -297,7 +297,7 @@

      This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.

      -

      The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.10, you need the phpBB-3.0.10_to_3.0.11.zip/tar.bz2 file.

      +

      The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.11, you need the phpBB-3.0.11_to_3.0.12.zip/tar.bz2 file.

      To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

      -- cgit v1.2.1 From 036a4188f3409387046aacaf22854edae4ace999 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 12 Jul 2013 00:54:35 +0200 Subject: [develop-olympus] Add changelog for 3.0.12 release. --- phpBB/docs/CHANGELOG.html | 185 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 165 insertions(+), 20 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4d44a88634..083566fe86 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
      1. Changelog
          +
        1. Changes since 3.0.11
        2. Changes since 3.0.10
        3. Changes since 3.0.9
        4. Changes since 3.0.8
        5. @@ -92,7 +93,151 @@
          -

          1.i. Changes since 3.0.10

          +

          1.i. Changes since 3.0.11

          + +

          Bug

          +
            +
          • [PHPBB3-6723] - Empty message in deleted messages in PM history
          • +
          • [PHPBB3-7262] - Clarify docs about is_dynamic not being updated by set_config()
          • +
          • [PHPBB3-8319] - LOCAL_URL not enforced in bbcodes
          • +
          • [PHPBB3-9551] - Mysql fulltext index creation fails due to partial collation change
          • +
          • [PHPBB3-9975] - Hard coded language in sessions.php
          • +
          • [PHPBB3-10184] - Bots can be sent private messages
          • +
          • [PHPBB3-10491] - Fatal error in functional tests when server returns 404
          • +
          • [PHPBB3-10568] - Modify the trigger language when you edit a PM
          • +
          • [PHPBB3-10602] - A bug in mail queue processing
          • +
          • [PHPBB3-10661] - UCP > PM > Compose > enumerated recipients > BCC group misses a &nbsp; (prosilver)
          • +
          • [PHPBB3-10678] - Provide Firebird, Oracle, and increased MSSQL support in unit tests
          • +
          • [PHPBB3-10772] - trigger_error is using the default style
          • +
          • [PHPBB3-10789] - PM print template (prosilver) with unnecessary variables
          • +
          • [PHPBB3-10820] - Display images directly in IE9 and 10 instead of download
          • +
          • [PHPBB3-10828] - PostgreSQL dbal tests try to connect to the database named as user specified in configuration
          • +
          • [PHPBB3-10838] - Functional tests are not mentioned in RUNNING_TESTS.txt
          • +
          • [PHPBB3-10840] - If you add a member to a group, the form_token can be set to 0 if the creation_time is 0 too. Maybe even if creation_time is unchanged.
          • +
          • [PHPBB3-10848] - Wrong redirect to installer from acp
          • +
          • [PHPBB3-10850] - create_schema_files.php is not creating the oracle or postgres' schema file properly
          • +
          • [PHPBB3-10879] - prosilver: attachment-link will be displayed wrong, when filename is too long
          • +
          • [PHPBB3-10880] - m_approve should not imply f_noapprove
          • +
          • [PHPBB3-10896] - board_email & board_contact are not validated as email addresses in ACP
          • +
          • [PHPBB3-10897] - Bot Definitions are outdated
          • +
          • [PHPBB3-10918] - docs/INSTALL.html claims there are tar.gz packages
          • +
          • [PHPBB3-10943] - Search Box should display keywords entered by the user
          • +
          • [PHPBB3-10967] - PHPBB_USE_BOARD_URL_PATH not implemented in posting_gen_topic_icons
          • +
          • [PHPBB3-10986] - Invalid email message ids because config variable server_name is used even when force server URL settings is disabled
          • +
          • [PHPBB3-10995] - Return value of $db->sql_fetchrow() on empty tables is not consistent on mssqlnative
          • +
          • [PHPBB3-10996] - Travis tests fail on Postgres because database does not exist
          • +
          • [PHPBB3-11034] - The functional test case framework does not install a full board each time
          • +
          • [PHPBB3-11066] - MSSQLnative driver contains debug code error_reporting(E_ALL)
          • +
          • [PHPBB3-11069] - missing closing span in subsilver2 simple_footer.html
          • +
          • [PHPBB3-11081] - Duplicated /TD in styles/subsilver2/template/catpcha_qa.html
          • +
          • [PHPBB3-11093] - acp_users_overview.html has a wrongly placed </dd>
          • +
          • [PHPBB3-11094] - prosilver: searching for users: no textbox for Jabber
          • +
          • [PHPBB3-11105] - Missing mandatory space in meta http-equiv=refresh
          • +
          • [PHPBB3-11112] - phpBB Footer Link should be SSL
          • +
          • [PHPBB3-11122] - Update docs/AUTHORS for 3.0.12-RC1
          • +
          • [PHPBB3-11144] - {FORUM_NAME} is not filled in login mask when logging into a password protected forum
          • +
          • [PHPBB3-11145] - ATTACHED_IMAGE_NOT_IMAGE thrown because of file limit in php.ini
          • +
          • [PHPBB3-11158] - modules table lacks acl_u_sig for signature module
          • +
          • [PHPBB3-11159] - Coding guidelines: static public
          • +
          • [PHPBB3-11164] - Composer not finding symfony/config in PHP 5.3.3
          • +
          • [PHPBB3-11178] - database_update.php should not set error_reporting to E_ALL
          • +
          • [PHPBB3-11186] - Database unit tests fail on windows using sqlite2
          • +
          • [PHPBB3-11190] - Functional tests do not clear the cache between each test
          • +
          • [PHPBB3-11196] - /includes/session.php sends 401 HTTP status with "Not authorized" instead of "Unauthorized"
          • +
          • [PHPBB3-11219] - Database sequences are not updated for tests using fixtures with auto_incremented columns
          • +
          • [PHPBB3-11227] - @return void -> @return null
          • +
          • [PHPBB3-11233] - Anonymous can be selected as a PM recipient
          • +
          • [PHPBB3-11248] - CRLF line endings
          • +
          • [PHPBB3-11262] - .lock files are not in .gitignore
          • +
          • [PHPBB3-11265] - Functional tests do not assert that board installation succeeded
          • +
          • [PHPBB3-11269] - Travis functional test case errors
          • +
          • [PHPBB3-11278] - Firebird tables are not removed correctly on 3.0.9-rc1 update
          • +
          • [PHPBB3-11288] - Search fooled by hyphens
          • +
          • [PHPBB3-11291] - "Could not open input file: ../composer.phar" error during phing's create-package
          • +
          • [PHPBB3-11292] - Newlines removed in display of PM reports, no clickable links in PM reports
          • +
          • [PHPBB3-11301] - "String offset cast occured" error on PHP 5.4
          • +
          • [PHPBB3-11304] - check_form_key breaks in tests when form is submitted in the same second it is retrieved
          • +
          • [PHPBB3-11343] - Loose string comparison during new password activation
          • +
          • [PHPBB3-11355] - Incorrect error message when no user selected for action on group membership management page
          • +
          • [PHPBB3-11358] - Success message even withot selecting a user and performing a group operation
          • +
          • [PHPBB3-11361] - "Array to string conversion" error in $user->format_date()
          • +
          • [PHPBB3-11493] - Functional tests should fail if any debug output is made
          • +
          • [PHPBB3-11517] - Numbering is wrong in coding guidelines
          • +
          • [PHPBB3-11536] - Installer incorrectly removes /install from script_path
          • +
          • [PHPBB3-11537] - UCP group manage page's error box differs heavily from the rest of the UCP
          • +
          • [PHPBB3-11538] - SQL error on UCP groups manage page caused by setting color to 7 characters long string
          • +
          • [PHPBB3-11544] - Add admin_login() to 3.0 functional test case
          • +
          • [PHPBB3-11545] - is_absolute() should not depend on DIRECTORY_SEPARATOR
          • +
          • [PHPBB3-11546] - is_absolute() throws E_NOTICE for empty string
          • +
          • [PHPBB3-11547] - Test fixtures do not support utf8 characters
          • +
          • [PHPBB3-11548] - Untranslated TOO_SHORT in UCP "Manage Groups"
          • +
          • [PHPBB3-11566] - Reporting a post should require a captcha to be solved by guests
          • +
          • [PHPBB3-11568] - Functional tests fail with retrieving install pages using file_get_contents
          • +
          • [PHPBB3-11575] - phpbb_dbal_order_lower_test::test_cross_join should be called test_order_lower
          • +
          • [PHPBB3-11578] - Missing underscore after function prefix in validate_data()
          • +
          • [PHPBB3-11579] - Add unit tests for validate_data()
          • +
          • [PHPBB3-11580] - Avoid API Limit from composer downloads on github
          • +
          • [PHPBB3-11588] - install/install_update.php should use version.phpbb.com instead of www
          • +
          • [PHPBB3-11590] - Close database connections from tests whenever possible
          • +
          • [PHPBB3-11601] - Allow manual resync of database columns in unit tests not only on fixture load
          • +
          • [PHPBB3-11603] - git-tools use invalid api urls
          • +
          • [PHPBB3-11604] - Functional tests fail when phpBB can not create the config file
          • +
          • [PHPBB3-11617] - Missing U_ACTION in acp_captcha.php
          • +
          • [PHPBB3-11618] - Template tests fail on some systems due to a PHP error in glob()
          • +
          • [PHPBB3-11619] - get_remote_file() should use HTTP 1.0
          • +
          • [PHPBB3-11630] - Improvements to the PHP lint pre-commit hook
          • +
          • [PHPBB3-11644] - Skip phpbb_dbal_order_lower_test on MySQL 5.6
          • +
          • [PHPBB3-11662] - "occured" should be "occurred"
          • +
          +

          Improvement

          +
            +
          • [PHPBB3-8743] - New topic / reply notifications do not contain author's name.
          • +
          • [PHPBB3-10050] - subsilver2: Do not show "Mark topics as read" when there are no topics
          • +
          • [PHPBB3-10205] - More informative reporting of errors when database connection fails (MySQL and others)
          • +
          • [PHPBB3-10716] - PHP-parse all php files as part of the test suite
          • +
          • [PHPBB3-10841] - Disable style and language selectors if there's only one installed.
          • +
          • [PHPBB3-10854] - sql server drop default constraint when dropping column
          • +
          • [PHPBB3-10865] - Updated and Added to docs/INSTALL.html
          • +
          • [PHPBB3-10873] - Change language entry for deleted PMs
          • +
          • [PHPBB3-10981] - Upgrade Goutte and use Composer for Installation
          • +
          • [PHPBB3-11131] - Phrasing & semantics of Board settings
          • +
          • [PHPBB3-11162] - Get rid of $db->sql_return_on_error(true) trickery when splitting/merging topics
          • +
          • [PHPBB3-11192] - Add Tebibyte to get_formatted_filesize()
          • +
          • [PHPBB3-11202] - Add response status checks to functional tests
          • +
          • [PHPBB3-11220] - Improve tooltip explaining the [list=] - BBcode
          • +
          • [PHPBB3-11238] - Specify goutte version
          • +
          • [PHPBB3-11285] - Use more granularity in dependency checks in compress test
          • +
          • [PHPBB3-11293] - Prefer mysqli over mysql due to php 5.5 alpha 2 deprecating mysql
          • +
          • [PHPBB3-11294] - Update extension list in running tests doc
          • +
          • [PHPBB3-11368] - Latest pm reports row count
          • +
          • [PHPBB3-11583] - InnoDB supports FULLTEXT index since MySQL 5.6.4.
          • +
          +

          Sub-task

          +
            +
          • [PHPBB3-10974] - Move tests/mock_user.php to tests/mock/user.php
          • +
          • [PHPBB3-11009] - Backport phing build.xml from develop to develop-olympus so it uses composer.
          • +
          • [PHPBB3-11540] - Add unit tests for (phpbb_)is_absolute()
          • +
          • [PHPBB3-11541] - Add unit tests for style_select() in functions.php
          • +
          • [PHPBB3-11542] - Add unit tests for language_select() in functions.php
          • +
          • [PHPBB3-11543] - Add unit tests for obtain online functions in functions.php
          • +
          +

          Task

          +
            +
          • [PHPBB3-10877] - Have bamboo generate and publish a phpBB package for every build.
          • +
          • [PHPBB3-11045] - Add unit tests for the compress class
          • +
          • [PHPBB3-11059] - Fix README logo
          • +
          • [PHPBB3-11060] - Fix travis.yml pyrus config
          • +
          • [PHPBB3-11240] - Turn on PHPUnit's verbose mode on Travis
          • +
          • [PHPBB3-11324] - Add PHP 5.5 environment on Travis-CI
          • +
          • [PHPBB3-11337] - Run functional tests on Travis CI
          • +
          • [PHPBB3-11513] - Install PHPUnit via Composer's require-dev to simplify test running (no need for pear)
          • +
          • [PHPBB3-11526] - Increase composer minimum-stability from beta to stable
          • +
          • [PHPBB3-11527] - Upgrade composer.phar to 1.0.0-alpha7
          • +
          • [PHPBB3-11529] - Rename RUNNING_TESTS file to .md file to render it on GitHub
          • +
          • [PHPBB3-11576] - Make phpBB Test Suite MySQL behave at least as strict as phpBB MySQL driver
          • +
          + +

          1.ii. Changes since 3.0.10

          Bug

            @@ -217,7 +362,7 @@
          • [PHPBB3-10909] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2
          -

          1.ii. Changes since 3.0.9

          +

          1.iii. Changes since 3.0.9

          Bug

            @@ -353,7 +498,7 @@
          • [PHPBB3-10480] - Automate changelog building
          -

          1.iii. Changes since 3.0.8

          +

          1.iv. Changes since 3.0.8

          Bug

          @@ -721,7 +866,7 @@
    -

    1.iv. Changes since 3.0.7-PL1

    +

    1.v. Changes since 3.0.7-PL1

    Security

      @@ -1179,13 +1324,13 @@
    -

    1.iv. Changes since 3.0.7

    +

    1.vi. Changes since 3.0.7

    • [Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)
    -

    1.vi. Changes since 3.0.6

    +

    1.vii. Changes since 3.0.6

    • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)
    • @@ -1289,7 +1434,7 @@
    -

    1.vii. Changes since 3.0.5

    +

    1.viii. Changes since 3.0.5

    • [Fix] Allow whitespaces in avatar gallery names. (Bug #44955)
    • @@ -1511,7 +1656,7 @@
    • [Feature] Send anonymous statistical information to phpBB on installation and update (optional).
    -

    1.viii. Changes since 3.0.4

    +

    1.ix. Changes since 3.0.4

    • [Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)
    • @@ -1600,7 +1745,7 @@
    • [Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)
    -

    1.ix. Changes since 3.0.3

    +

    1.x. Changes since 3.0.3

    • [Fix] Allow mixed-case template directories to be inherited (Bug #36725)
    • @@ -1632,7 +1777,7 @@
    • [Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)
    -

    1.x. Changes since 3.0.2

    +

    1.xi. Changes since 3.0.2

    • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
    • @@ -1731,7 +1876,7 @@
    • [Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)
    -

    1.xi. Changes since 3.0.1

    +

    1.xii. Changes since 3.0.1

    • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
    • @@ -1779,7 +1924,7 @@
    • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
    -

    1.xii Changes since 3.0.0

    +

    1.xiii Changes since 3.0.0

    • [Change] Validate birthdays (Bug #15004)
    • @@ -1850,7 +1995,7 @@
    • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
    -

    1.xiii. Changes since 3.0.RC8

    +

    1.xiv. Changes since 3.0.RC8

    • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
    • @@ -1859,7 +2004,7 @@
    • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
    -

    1.xiv. Changes since 3.0.RC7

    +

    1.xv. Changes since 3.0.RC7

    • [Fix] Fixed MSSQL related bug in the update system
    • @@ -1894,7 +2039,7 @@
    • [Fix] No duplication of active topics (Bug #15474)
    -

    1.xv. Changes since 3.0.RC6

    +

    1.xvi. Changes since 3.0.RC6

    • [Fix] Submitting language changes using acp_language (Bug #14736)
    • @@ -1904,7 +2049,7 @@
    • [Fix] Able to request new password (Bug #14743)
    -

    1.xvi. Changes since 3.0.RC5

    +

    1.xvii. Changes since 3.0.RC5

    • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
    • @@ -1967,7 +2112,7 @@
    • [Sec] New password hashing mechanism for storing passwords (#i42)
    -

    1.xvii. Changes since 3.0.RC4

    +

    1.xviii. Changes since 3.0.RC4

    • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
    • @@ -2018,7 +2163,7 @@
    • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
    -

    1.xviii. Changes since 3.0.RC3

    +

    1.xix. Changes since 3.0.RC3

    • [Fix] Fixing some subsilver2 and prosilver style issues
    • @@ -2127,7 +2272,7 @@
    -

    1.xviv. Changes since 3.0.RC2

    +

    1.xx. Changes since 3.0.RC2

    • [Fix] Re-allow searching within the memberlist
    • @@ -2173,7 +2318,7 @@
    -

    1.xx. Changes since 3.0.RC1

    +

    1.xxi. Changes since 3.0.RC1

    • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
    • -- cgit v1.2.1 From 07eadac2f6a57075450c5b543770904839e3764a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 12 Jul 2013 16:24:27 -0400 Subject: [ticket/11112] Use https for user-visible links to phpbb.com PHPBB3-11112 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/docs/FAQ.html | 12 ++++++------ phpBB/docs/INSTALL.html | 12 ++++++------ phpBB/docs/README.html | 28 ++++++++++++++-------------- phpBB/docs/auth_api.html | 2 +- phpBB/docs/coding-guidelines.html | 4 ++-- phpBB/docs/hook_system.html | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 083566fe86..4b916fadbc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -2453,7 +2453,7 @@
      -

      This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

      +

      This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

      diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index dbcefc44c1..9b6440ab21 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -89,7 +89,7 @@

      There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!

      -

      We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at www.phpbb.com and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.

      +

      We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at www.phpbb.com and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.

    @@ -150,7 +150,7 @@ I want to sue you because i think you host an illegal board!
    -

    This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP mail() function or directly via SMTP. Some hosting providers limit the mail() function to prevent its use in spamming, others may rename it or limit its functionality. If the mail() function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see www.phpbb.com for additional help on this matter.

    +

    This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP mail() function or directly via SMTP. Some hosting providers limit the mail() function to prevent its use in spamming, others may rename it or limit its functionality. If the mail() function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see www.phpbb.com for additional help on this matter.

    If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.

    @@ -250,7 +250,7 @@ I want to sue you because i think you host an illegal board!
    -

    Please read the paragraph about permissions in our extensive online documentation.

    +

    Please read the paragraph about permissions in our extensive online documentation.

    @@ -306,11 +306,11 @@ I want to sue you because i think you host an illegal board!
    -

    Please read our extensive user documentation first, it may just explain what you want to know.

    +

    Please read our extensive user documentation first, it may just explain what you want to know.

    Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

    -

    www.phpbb.com

    +

    www.phpbb.com

    @@ -328,7 +328,7 @@ I want to sue you because i think you host an illegal board!
    -

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    +

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index cd1185644b..3fa0597fc8 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -46,7 +46,7 @@

    This document will walk you through the basics on installing, updating and converting the forum software.

    -

    A basic overview of running phpBB3 can be found in the accompanying README file. Please ensure you read that document in addition to this! For more detailed information on using, installing, updating and converting phpBB3 you should read the documentation available online.

    +

    A basic overview of running phpBB3 can be found in the accompanying README file. Please ensure you read that document in addition to this! For more detailed information on using, installing, updating and converting phpBB3 you should read the documentation available online.

    Install

    @@ -223,7 +223,7 @@

    Administrator details

    -

    Now you have to create your administration user. This user will have full administration access and he/she will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation, we only include British English. You can download further languages from www.phpbb.com, and add them before installing or later.

    +

    Now you have to create your administration user. This user will have full administration access and he/she will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation, we only include British English. You can download further languages from www.phpbb.com, and add them before installing or later.

    Configuration file

    @@ -302,7 +302,7 @@

    To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

      -
    • Go to the downloads page and download the latest update package listed there, matching your current version.
    • +
    • Go to the downloads page and download the latest update package listed there, matching your current version.
    • Upload the uncompressed archive contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.
    • After the install folder is present, phpBB3 will go offline automatically.
    • Point your browser to the install directory, for example http://www.example.com/phpBB3/install/
    • @@ -349,7 +349,7 @@

      As with install, the conversion is automated. Your previous 2.0.x database tables will not be changed and the original 2.0.x files will remain unaltered. The conversion is actually only filling your phpBB3 database tables and copying additional data over to your phpBB3 installation. This has the benefit that if something goes wrong, you are able to either re-run the conversion or continue a conversion, while your old board is still accessible. We really recommend that you disable your old installation while converting, else you may have inconsistent data after the conversion.

      -

      Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server resource limits or other timeout issues). If this is the case, you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful). If your host is unwilling to increase the limits to run the convertor, please see this article for performing the conversion on your local machine: Knowledge Base - Offline Conversions

      +

      Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server resource limits or other timeout issues). If this is the case, you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful). If your host is unwilling to increase the limits to run the convertor, please see this article for performing the conversion on your local machine: Knowledge Base - Offline Conversions

      Once completed, your board should be immediately available. If you encountered errors, you should report the problems to our bug tracker or seek help via our forums (see README for details).

      @@ -433,7 +433,7 @@
      -

      Like any online site that allows user input, your board could be subject to unwanted posts; often referred to as forum spam. The vast majority of these attacks will be from automated computer programs known as spambots. The attacks, generally, are not personal as the spammers are just trying to find accessible targets. phpBB has a number of anti-spam measures built in, including a range of CAPTCHAs. However, administrators are strongly urged to read and follow the advice for Preventing Spam in phpBB as soon as possible after completing the installation of your board.

      +

      Like any online site that allows user input, your board could be subject to unwanted posts; often referred to as forum spam. The vast majority of these attacks will be from automated computer programs known as spambots. The attacks, generally, are not personal as the spammers are just trying to find accessible targets. phpBB has a number of anti-spam measures built in, including a range of CAPTCHAs. However, administrators are strongly urged to read and follow the advice for Preventing Spam in phpBB as soon as possible after completing the installation of your board.

      @@ -450,7 +450,7 @@
      -

      This application is opensource software released under the GNU General Public License v2. Please see the source code and docs/ directory for more details. This package and its contents are Copyright © phpBB Group, All Rights Reserved.

      +

      This application is opensource software released under the GNU General Public License v2. Please see the source code and docs/ directory for more details. This package and its contents are Copyright © phpBB Group, All Rights Reserved.

      diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 81ce736df7..89f573de04 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -132,21 +132,21 @@

      2.i. Languages (Internationalisation - i18n)

      -

      A number of language packs with included style localisations are available. You can find them listed in the Language Packs pages of our downloads section or from the Language Packs section of the Customisation Database.

      +

      A number of language packs with included style localisations are available. You can find them listed in the Language Packs pages of our downloads section or from the Language Packs section of the Customisation Database.

      -

      For more information about language packs, please see: http://www.phpbb.com/languages/

      +

      For more information about language packs, please see: https://www.phpbb.com/languages/

      This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. Please do not ask for support if you download a language pack from a 3rd party site.

      -

      Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included language and styles folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: System tab -> General Tasks -> Language packs. A more detailed description of the process is in the Knowledge Base article, How to Install a Language Pack.

      +

      Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included language and styles folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: System tab -> General Tasks -> Language packs. A more detailed description of the process is in the Knowledge Base article, How to Install a Language Pack.

      -

      If your language is not available, please visit our [3.0.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      +

      If your language is not available, please visit our [3.0.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      2.ii. Styles

      -

      Although the phpBB Group is rather proud of the included styles, we realise that they may not be to everyone's taste. Therefore, phpBB3 allows styles to be switched with relative ease. First, you need to locate and download a style you like. You can find them listed in the Styles section of our Customisation Database.

      +

      Although the phpBB Group is rather proud of the included styles, we realise that they may not be to everyone's taste. Therefore, phpBB3 allows styles to be switched with relative ease. First, you need to locate and download a style you like. You can find them listed in the Styles section of our Customisation Database.

      -

      For more information about styles, please see: http://www.phpbb.com/styles/

      +

      For more information about styles, please see: https://www.phpbb.com/styles/

      Please note that 3rd party styles downloaded for versions of phpBB2 will not work in phpBB3. It is also important to ensure that the style is updated to match the current version of the phpBB software you are using.

      @@ -156,9 +156,9 @@

      2.iii. Modifications

      -

      Although not officially supported by the phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB software, known as MODs, extend its capabilities still further. You can browse through many of the MODs in the Modifications section of our Customisation Database.

      +

      Although not officially supported by the phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB software, known as MODs, extend its capabilities still further. You can browse through many of the MODs in the Modifications section of our Customisation Database.

      -

      For more information about MODs, please see: http://www.phpbb.com/mods/

      +

      For more information about MODs, please see: https://www.phpbb.com/mods/

      Please remember that any bugs or other issues that occur after you have added any modification should NOT be reported to the bug tracker (see below). First remove the MOD and see if the problem is resolved. Any support for a MOD should only be sought in the "Discussion/Support" forum for that MOD.

      @@ -186,7 +186,7 @@

      Comprehensive documentation is now available on the phpBB website:

      -

      http://www.phpbb.com/support/documentation/3.0/

      +

      https://www.phpbb.com/support/documentation/3.0/

      This covers everything from installation to setting permissions and managing users.

      @@ -194,13 +194,13 @@

      The Knowledge Base consists of a number of detailed articles on some common issues phpBB users may encounter while using the product. The Knowledge Base can be found at:

      -

      http://www.phpbb.com/kb/

      +

      https://www.phpbb.com/kb/

      3.iii. Community Forums

      The phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:

      -

      http://www.phpbb.com/community/

      +

      https://www.phpbb.com/community/

      If you do seek help via our forums please be sure to do a search before posting; if someone has experienced the issue before, then you may find that your question has already been answered. Please remember that phpBB is entirely staffed by volunteers, no one receives any compensation for the time they give, including moderators as well as developers; please be respectful and mindful when awaiting responses and receiving support.

      @@ -208,7 +208,7 @@

      Another place you may find help is our IRC channel. This operates on the Freenode IRC network, irc.freenode.net and the channel is #phpbb and can be accessed by any decent IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

      -

      There are other IRC channels available, please see http://www.phpbb.com/support/irc/ for the complete list.

      +

      There are other IRC channels available, please see https://www.phpbb.com/support/irc/ for the complete list.

      @@ -283,7 +283,7 @@

      If you find a potential security related vulnerability in phpBB please DO NOT post it to the bug tracker, public forums, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:

      -

      http://www.phpbb.com/security/

      +

      https://www.phpbb.com/security/

    @@ -351,7 +351,7 @@
    -

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright © phpBB Group, All Rights Reserved.

    +

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright © phpBB Group, All Rights Reserved.

    diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index a319460360..eb168e26a6 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -275,7 +275,7 @@ $auth_admin = new auth_admin();
    -

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    +

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index dd0ee0a82f..a541fe8866 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1191,7 +1191,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp; <!-- INCLUDEPHP somefile.php --> -

    it will be included and executed inline.

    A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence www.phpbb.com will not make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).

    +

    it will be included and executed inline.

    A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence www.phpbb.com will not make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).

    Conditionals/Control structures

    The most significant addition to 3.0.x are conditions or control structures, "if something then do this else do that". The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:

    @@ -2323,7 +2323,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
    -

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    +

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html index 1b8131efaf..fbc8baaf75 100644 --- a/phpBB/docs/hook_system.html +++ b/phpBB/docs/hook_system.html @@ -867,7 +867,7 @@ function phpbb_hook_register(&$hook)
    -

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    +

    This application is opensource software released under the GNU General Public License v2. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) phpBB Group, All Rights Reserved.

    -- cgit v1.2.1 From 9e789c4e9f3e5b4b0697cd900a24467b7be9a71f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 13 Jul 2013 19:30:09 +0200 Subject: [prep-release-3.0.12] More changelog items for the 3.0.12 release. --- phpBB/docs/CHANGELOG.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4b916fadbc..44cc49d8c4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -188,6 +188,8 @@
  • [PHPBB3-11630] - Improvements to the PHP lint pre-commit hook
  • [PHPBB3-11644] - Skip phpbb_dbal_order_lower_test on MySQL 5.6
  • [PHPBB3-11662] - "occured" should be "occurred"
  • +
  • [PHPBB3-11670] - Replace trademark ™ with ® on "Welcome to phpBB" install page
  • +
  • [PHPBB3-11674] - Do not include vendor folder if there are no dependencies.
  • Improvement

    1.ii. Changes since 3.0.10

    -- cgit v1.2.1 From cd329c55a7bd7222982283e5a378e511c06bdfe8 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 26 Jul 2013 18:31:05 -0700 Subject: [ticket/11747] ucp_prefs_personal template events PHPBB3-11747 --- phpBB/docs/events.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 3723bf7b3f..cc12410df2 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -119,6 +119,20 @@ ucp_pm_viewmessage_print_head_append * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html * Purpose: Add asset calls directly before the `` tag of the Print PM screen +ucp_prefs_personal_before +=== +* Locations: + + styles/prosilver/template/ucp_prefs_personal.html + + styles/subsilver2/template/ucp_prefs_personal.html +* Purpose: Add user options to the top of the Edit Global Settings screen + +ucp_prefs_personal_after +=== +* Locations: + + styles/prosilver/template/ucp_prefs_personal.html + + styles/subsilver2/template/ucp_prefs_personal.html +* Purpose: Add user options to the bottom of the Edit Global Settings screen + viewtopic_print_head_append === * Location: styles/prosilver/template/viewtopic_print.html -- cgit v1.2.1 From b716e1177d0fc94f1b5b8102fd35b61a6874e324 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 26 Jul 2013 18:33:07 -0700 Subject: [ticket/11747] ucp_prefs_view template events PHPBB3-11747 --- phpBB/docs/events.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index cc12410df2..93f83e8d1c 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -133,6 +133,38 @@ ucp_prefs_personal_after + styles/subsilver2/template/ucp_prefs_personal.html * Purpose: Add user options to the bottom of the Edit Global Settings screen +ucp_prefs_view_radio_buttons_before +=== +* Locations: + + styles/prosilver/template/ucp_prefs_view.html + + styles/subsilver2/template/ucp_prefs_view.html +* Purpose: Add options to the top of the radio buttons section of the Edit +Display Options screen + +ucp_prefs_view_radio_buttons_after +=== +* Locations: + + styles/prosilver/template/ucp_prefs_view.html + + styles/subsilver2/template/ucp_prefs_view.html +* Purpose: Add options to the bottom of the radio buttons section of the Edit +Display Options screen + +ucp_prefs_view_select_menu_before +=== +* Locations: + + styles/prosilver/template/ucp_prefs_view.html + + styles/subsilver2/template/ucp_prefs_view.html +* Purpose: Add options to the top of the drop down menus section of the Edit +Display Options screen + +ucp_prefs_view_select_menu_after +=== +* Locations: + + styles/prosilver/template/ucp_prefs_view.html + + styles/subsilver2/template/ucp_prefs_view.html +* Purpose: Add options to the bottom of the drop down menus section of the Edit +Display Options screen + viewtopic_print_head_append === * Location: styles/prosilver/template/viewtopic_print.html -- cgit v1.2.1 From 442b2a292e2b761b58f2ba88fd5922d0090ec4a5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 26 Jul 2013 18:33:54 -0700 Subject: [ticket/11747] ucp_prefs_post template events PHPBB3-11747 --- phpBB/docs/events.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 93f83e8d1c..74bbc675d2 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -133,6 +133,20 @@ ucp_prefs_personal_after + styles/subsilver2/template/ucp_prefs_personal.html * Purpose: Add user options to the bottom of the Edit Global Settings screen +ucp_prefs_post_before +=== +* Locations: + + styles/prosilver/template/ucp_prefs_post.html + + styles/subsilver2/template/ucp_prefs_post.html +* Purpose: Add user options to the top of the Edit Posting Defaults screen + +ucp_prefs_post_after +=== +* Locations: + + styles/prosilver/template/ucp_prefs_post.html + + styles/subsilver2/template/ucp_prefs_post.html +* Purpose: Add user options to the bottom of the Edit Posting Defaults screen + ucp_prefs_view_radio_buttons_before === * Locations: -- cgit v1.2.1 From dacca5657a59fe1e69f5609cf9112e8e2cdac369 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 26 Jul 2013 22:25:27 -0700 Subject: [ticket/11747] Use _prepend and _append for template events PHPBB3-11747 --- phpBB/docs/events.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 74bbc675d2..f6a92aaf69 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -119,35 +119,35 @@ ucp_pm_viewmessage_print_head_append * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html * Purpose: Add asset calls directly before the `` tag of the Print PM screen -ucp_prefs_personal_before +ucp_prefs_personal_prepend === * Locations: + styles/prosilver/template/ucp_prefs_personal.html + styles/subsilver2/template/ucp_prefs_personal.html * Purpose: Add user options to the top of the Edit Global Settings screen -ucp_prefs_personal_after +ucp_prefs_personal_append === * Locations: + styles/prosilver/template/ucp_prefs_personal.html + styles/subsilver2/template/ucp_prefs_personal.html * Purpose: Add user options to the bottom of the Edit Global Settings screen -ucp_prefs_post_before +ucp_prefs_post_prepend === * Locations: + styles/prosilver/template/ucp_prefs_post.html + styles/subsilver2/template/ucp_prefs_post.html * Purpose: Add user options to the top of the Edit Posting Defaults screen -ucp_prefs_post_after +ucp_prefs_post_append === * Locations: + styles/prosilver/template/ucp_prefs_post.html + styles/subsilver2/template/ucp_prefs_post.html * Purpose: Add user options to the bottom of the Edit Posting Defaults screen -ucp_prefs_view_radio_buttons_before +ucp_prefs_view_radio_buttons_prepend === * Locations: + styles/prosilver/template/ucp_prefs_view.html @@ -155,7 +155,7 @@ ucp_prefs_view_radio_buttons_before * Purpose: Add options to the top of the radio buttons section of the Edit Display Options screen -ucp_prefs_view_radio_buttons_after +ucp_prefs_view_radio_buttons_append === * Locations: + styles/prosilver/template/ucp_prefs_view.html @@ -163,7 +163,7 @@ ucp_prefs_view_radio_buttons_after * Purpose: Add options to the bottom of the radio buttons section of the Edit Display Options screen -ucp_prefs_view_select_menu_before +ucp_prefs_view_select_menu_prepend === * Locations: + styles/prosilver/template/ucp_prefs_view.html @@ -171,7 +171,7 @@ ucp_prefs_view_select_menu_before * Purpose: Add options to the top of the drop down menus section of the Edit Display Options screen -ucp_prefs_view_select_menu_after +ucp_prefs_view_select_menu_append === * Locations: + styles/prosilver/template/ucp_prefs_view.html -- cgit v1.2.1 From 9ea9afd1c431c8b6531adeac38b928f1ed6ba709 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 27 Jul 2013 09:19:34 -0700 Subject: [ticket/11747] Tweak some of the wording in the events doc PHPBB3-11747 --- phpBB/docs/events.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index f6a92aaf69..300498b063 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -124,35 +124,35 @@ ucp_prefs_personal_prepend * Locations: + styles/prosilver/template/ucp_prefs_personal.html + styles/subsilver2/template/ucp_prefs_personal.html -* Purpose: Add user options to the top of the Edit Global Settings screen +* Purpose: Add user options to the top of the Edit Global Settings block ucp_prefs_personal_append === * Locations: + styles/prosilver/template/ucp_prefs_personal.html + styles/subsilver2/template/ucp_prefs_personal.html -* Purpose: Add user options to the bottom of the Edit Global Settings screen +* Purpose: Add user options to the bottom of the Edit Global Settings block ucp_prefs_post_prepend === * Locations: + styles/prosilver/template/ucp_prefs_post.html + styles/subsilver2/template/ucp_prefs_post.html -* Purpose: Add user options to the top of the Edit Posting Defaults screen +* Purpose: Add user options to the top of the Edit Posting Defaults block ucp_prefs_post_append === * Locations: + styles/prosilver/template/ucp_prefs_post.html + styles/subsilver2/template/ucp_prefs_post.html -* Purpose: Add user options to the bottom of the Edit Posting Defaults screen +* Purpose: Add user options to the bottom of the Edit Posting Defaults block ucp_prefs_view_radio_buttons_prepend === * Locations: + styles/prosilver/template/ucp_prefs_view.html + styles/subsilver2/template/ucp_prefs_view.html -* Purpose: Add options to the top of the radio buttons section of the Edit +* Purpose: Add options to the top of the radio buttons block of the Edit Display Options screen ucp_prefs_view_radio_buttons_append @@ -160,7 +160,7 @@ ucp_prefs_view_radio_buttons_append * Locations: + styles/prosilver/template/ucp_prefs_view.html + styles/subsilver2/template/ucp_prefs_view.html -* Purpose: Add options to the bottom of the radio buttons section of the Edit +* Purpose: Add options to the bottom of the radio buttons block of the Edit Display Options screen ucp_prefs_view_select_menu_prepend @@ -168,7 +168,7 @@ ucp_prefs_view_select_menu_prepend * Locations: + styles/prosilver/template/ucp_prefs_view.html + styles/subsilver2/template/ucp_prefs_view.html -* Purpose: Add options to the top of the drop down menus section of the Edit +* Purpose: Add options to the top of the drop-down lists block of the Edit Display Options screen ucp_prefs_view_select_menu_append @@ -176,7 +176,7 @@ ucp_prefs_view_select_menu_append * Locations: + styles/prosilver/template/ucp_prefs_view.html + styles/subsilver2/template/ucp_prefs_view.html -* Purpose: Add options to the bottom of the drop down menus section of the Edit +* Purpose: Add options to the bottom of the drop-down lists block of the Edit Display Options screen viewtopic_print_head_append -- cgit v1.2.1 From 8e636e4572ef11af61f2b2c6dfb56d7a9530c8de Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 27 Jul 2013 10:48:40 -0700 Subject: [ticket/11749] Template events for topic_list_row_pre/append PHPBB3-11749 --- phpBB/docs/events.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 3723bf7b3f..855f238653 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -114,6 +114,24 @@ simple_footer_after * Location: styles/prosilver/template/simple_footer.html * Purpose: Add content directly prior to the `` tag of the simple footer +topiclist_row_prepend +=== +* Locations: + + styles/prosilver/template/search_results.html + + styles/prosilver/template/viewforum_body.html + + styles/subsilver2/template/search_results.html + + styles/subsilver2/template/viewforum_body.html +* Purpose: Add content into topic rows (inside the elements containing topic titles) + +topiclist_row_append +=== +* Locations: + + styles/prosilver/template/search_results.html + + styles/prosilver/template/viewforum_body.html + + styles/subsilver2/template/search_results.html + + styles/subsilver2/template/viewforum_body.html +* Purpose: Add content into topic rows (inside the elements containing topic titles) + ucp_pm_viewmessage_print_head_append === * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html -- cgit v1.2.1 From 0a73d64b9772971b7e43e989c659184ee20c5bc6 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 1 Aug 2013 17:28:21 +0200 Subject: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. --- phpBB/docs/CHANGELOG.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 44cc49d8c4..f2d5ddc212 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -190,6 +190,8 @@
  • [PHPBB3-11662] - "occured" should be "occurred"
  • [PHPBB3-11670] - Replace trademark ™ with ® on "Welcome to phpBB" install page
  • [PHPBB3-11674] - Do not include vendor folder if there are no dependencies.
  • +
  • [PHPBB3-11524] - MySQL Upgrader throws warnings on PHP 5.4
  • +
  • [PHPBB3-11720] - Reporting posts leads to white page error
  • Improvement

      @@ -213,6 +215,7 @@
    • [PHPBB3-11294] - Update extension list in running tests doc
    • [PHPBB3-11368] - Latest pm reports row count
    • [PHPBB3-11583] - InnoDB supports FULLTEXT index since MySQL 5.6.4.
    • +
    • [PHPBB3-11740] - Update link in FAQ to Ideas Centre

    Sub-task

      @@ -238,6 +241,8 @@
    • [PHPBB3-11529] - Rename RUNNING_TESTS file to .md file to render it on GitHub
    • [PHPBB3-11576] - Make phpBB Test Suite MySQL behave at least as strict as phpBB MySQL driver
    • [PHPBB3-11671] - Add phing/phing to composer.json
    • +
    • [PHPBB3-11752] - Update phpBB.com URLs to https in email templates
    • +
    • [PHPBB3-11753] - Upgrade mysql_upgrader.php schema data.

    1.ii. Changes since 3.0.10

    -- cgit v1.2.1 From 8c565ea1a642ab7b72d22eaf6c83236cef9444a1 Mon Sep 17 00:00:00 2001 From: rechosen Date: Wed, 17 Jul 2013 15:06:53 +0200 Subject: [ticket/9550] Add the new template events to phpBB/docs/events.md The newly added template events weren't listed and described yet in events.md. Fixed now. PHPBB3-9550 --- phpBB/docs/events.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 855f238653..d037237b34 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -52,6 +52,38 @@ index_body_stat_blocks_before + styles/subsilver2/template/index_body.html * Purpose: Add new statistic blocks above the Who Is Online and Board Statistics blocks +memberlist_body_username_append +=== +* Locations: + + styles/prosilver/template/memberlist_body.html + + styles/subsilver2/template/memberlist_body.html +* Purpose: Add information after every username in the memberlist. Works in +all display modes (leader, group and normal memberlist). + +memberlist_body_username_prepend +=== +* Locations: + + styles/prosilver/template/memberlist_body.html + + styles/subsilver2/template/memberlist_body.html +* Purpose: Add information before every username in the memberlist. Works in +all display modes (leader, group and normal memberlist). + +memberlist_view_user_statistics_after +=== +* Locations: + + styles/prosilver/template/memberlist_view.html + + styles/subsilver2/template/memberlist_view.html +* Purpose: Add entries to the bottom of the user statistics part of any user +profile + +memberlist_view_user_statistics_before +=== +* Locations: + + styles/prosilver/template/memberlist_view.html + + styles/subsilver2/template/memberlist_view.html +* Purpose: Add entries to the top of the user statistics part of any user +profile + overall_footer_after === * Locations: @@ -132,6 +164,18 @@ topiclist_row_append + styles/subsilver2/template/viewforum_body.html * Purpose: Add content into topic rows (inside the elements containing topic titles) +ucp_pm_viewmessage_custom_fields_after +=== +* Location: styles/prosilver/template/ucp_pm_viewmessage.html +* Purpose: Add data after the custom fields, under the username and avatar +next to every private message in prosilver + +ucp_pm_viewmessage_custom_fields_before +=== +* Location: styles/prosilver/template/ucp_pm_viewmessage.html +* Purpose: Add data before the custom fields, under the username and avatar +next to every private message in prosilver + ucp_pm_viewmessage_print_head_append === * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -151,6 +195,38 @@ viewtopic_body_footer_before and quick reply, directly before the jumpbox in Prosilver, breadcrumbs in Subsilver2. +viewtopic_body_post_buttons_after +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add post button to posts (next to edit, quote etc), at the end of +the list. + +viewtopic_body_post_buttons_before +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add post button to posts (next to edit, quote etc), at the start of +the list. + +viewtopic_body_postrow_custom_fields_after +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add data after the postrow custom fields, under the username and +avatar next to every post. + +viewtopic_body_postrow_custom_fields_before +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html + + styles/subsilver2/template/viewtopic_body.html +* Purpose: Add data before the postrow custom fields, under the username and +avatar next to every post. + viewtopic_topic_title_prepend === * Locations: -- cgit v1.2.1 From f61910c3f83fd4de16ca946232bab1bd3c679341 Mon Sep 17 00:00:00 2001 From: rechosen Date: Fri, 2 Aug 2013 11:38:25 +0200 Subject: [ticket/9550] Improve template event descriptions in phpBB/docs/events.md Per suggestion of nickvergessen, stick to "before" and "after" in the template event descriptions instead of "at the top of" and "at the bottom of". PHPBB3-9550 --- phpBB/docs/events.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d037237b34..b1e8c7ad05 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -73,16 +73,14 @@ memberlist_view_user_statistics_after * Locations: + styles/prosilver/template/memberlist_view.html + styles/subsilver2/template/memberlist_view.html -* Purpose: Add entries to the bottom of the user statistics part of any user -profile +* Purpose: Add entries after the user statistics part of any user profile memberlist_view_user_statistics_before === * Locations: + styles/prosilver/template/memberlist_view.html + styles/subsilver2/template/memberlist_view.html -* Purpose: Add entries to the top of the user statistics part of any user -profile +* Purpose: Add entries before the user statistics part of any user profile overall_footer_after === -- cgit v1.2.1 From 61fd61692b5c93eee560424717d272d84d710cd4 Mon Sep 17 00:00:00 2001 From: rechosen Date: Fri, 2 Aug 2013 11:44:07 +0200 Subject: [ticket/9550] Improve template event descriptions in phpBB/docs/events.md Update the custom_fields template events descriptions according to nickvergessen's suggestions. PHPBB3-9550 --- phpBB/docs/events.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index b1e8c7ad05..af6e6bdb1c 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -165,14 +165,14 @@ topiclist_row_append ucp_pm_viewmessage_custom_fields_after === * Location: styles/prosilver/template/ucp_pm_viewmessage.html -* Purpose: Add data after the custom fields, under the username and avatar -next to every private message in prosilver +* Purpose: Add data after the custom fields on the user profile when viewing +a private message ucp_pm_viewmessage_custom_fields_before === * Location: styles/prosilver/template/ucp_pm_viewmessage.html -* Purpose: Add data before the custom fields, under the username and avatar -next to every private message in prosilver +* Purpose: Add data before the custom fields on the user profile when viewing +a private message ucp_pm_viewmessage_print_head_append === @@ -214,16 +214,16 @@ viewtopic_body_postrow_custom_fields_after * Locations: + styles/prosilver/template/viewtopic_body.html + styles/subsilver2/template/viewtopic_body.html -* Purpose: Add data after the postrow custom fields, under the username and -avatar next to every post. +* Purpose: Add data after the custom fields on the user profile when viewing +a post viewtopic_body_postrow_custom_fields_before === * Locations: + styles/prosilver/template/viewtopic_body.html + styles/subsilver2/template/viewtopic_body.html -* Purpose: Add data before the postrow custom fields, under the username and -avatar next to every post. +* Purpose: Add data before the custom fields on the user profile when viewing +a post viewtopic_topic_title_prepend === -- cgit v1.2.1 From 48f6f4559c9d3df49b56f0831a89b516f0f2f34f Mon Sep 17 00:00:00 2001 From: rechosen Date: Fri, 16 Aug 2013 17:48:36 +0200 Subject: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794 --- phpBB/docs/coding-guidelines.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index a541fe8866..f3d161589b 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -728,7 +728,7 @@ $sql = 'SELECT * $sql_ary = array( 'somedata' => $my_string, 'otherdata' => $an_int, - 'moredata' => $another_int + 'moredata' => $another_int, ); $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); @@ -740,7 +740,7 @@ $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('I $sql_ary = array( 'somedata' => $my_string, 'otherdata' => $an_int, - 'moredata' => $another_int + 'moredata' => $another_int, ); $sql = 'UPDATE ' . SOME_TABLE . ' @@ -833,20 +833,20 @@ $sql_array = array( 'FROM' => array( FORUMS_WATCH_TABLE => 'fw', - FORUMS_TABLE => 'f' + FORUMS_TABLE => 'f', ), 'LEFT_JOIN' => array( array( 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' - ) + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ), ), 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' AND f.forum_id = fw.forum_id', - 'ORDER_BY' => 'left_id' + 'ORDER_BY' => 'left_id', ); $sql = $db->sql_build_query('SELECT', $sql_array); @@ -860,13 +860,13 @@ $sql_array = array( 'FROM' => array( FORUMS_WATCH_TABLE => 'fw', - FORUMS_TABLE => 'f' + FORUMS_TABLE => 'f', ), 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' AND f.forum_id = fw.forum_id', - 'ORDER_BY' => 'left_id' + 'ORDER_BY' => 'left_id', ); if ($config['load_db_lastread']) @@ -874,8 +874,8 @@ if ($config['load_db_lastread']) $sql_array['LEFT_JOIN'] = array( array( 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' - ) + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ), ); $sql_array['SELECT'] .= ', ft.mark_time '; -- cgit v1.2.1 From 50818a342bf60eba038b47af36f7ff32d3f7867a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 2 Sep 2013 23:42:45 +0200 Subject: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. --- phpBB/docs/CHANGELOG.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f2d5ddc212..26f1d6ff94 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -192,6 +192,9 @@
  • [PHPBB3-11674] - Do not include vendor folder if there are no dependencies.
  • [PHPBB3-11524] - MySQL Upgrader throws warnings on PHP 5.4
  • [PHPBB3-11720] - Reporting posts leads to white page error
  • +
  • [PHPBB3-11769] - Wrong poster in subscription email when poster is using the Quote button
  • +
  • [PHPBB3-11775] - Error while moving posts to a new topic
  • +
  • [PHPBB3-11802] - Undefined variable $browser in /download/file.php
  • Improvement

      -- cgit v1.2.1