From 5d0796624f6bb88e6e57551158e911703ac6f62c Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 15 Nov 2012 17:45:00 -0500 Subject: [ticket/11205] Fix merge conflict in readme.html. PHPBB3-11205 --- phpBB/docs/README.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 0e0d3b14fd..164c4a2f55 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -324,11 +324,7 @@

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.

-<<<<<<< HEAD -

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 8.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.

-======= -

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 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem.

->>>>>>> develop-olympus +

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 8.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.

7.i. Notice on PHP security issues

-- cgit v1.2.1 From 65253a3023a78b1068be63b91b77618e3fb2d5fd Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 29 Nov 2012 15:35:21 -0500 Subject: [ticket/11227] @return void -> @return null in develop-olympus. PHPBB3-11227 --- phpBB/docs/auth_api.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index 29469c21ac..a319460360 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -200,7 +200,7 @@ $user_id = 2; $auth->acl_clear_prefetch($user_id); -

This method returns void.

+

This method returns null.

2.viii. acl_get_list

-- cgit v1.2.1 From b67f112e03cf37436bdd650ea4b9a75b35000fdd Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Tue, 4 Dec 2012 02:52:18 -0500 Subject: [ticket/10091] Bump minimum supported postgresql version to 8.3. PHPBB3-10091 --- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/coding-guidelines.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 07f0cbc8c2..58aeb904c7 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -132,7 +132,7 @@
  • A SQL database system, one of:
    • MySQL 3.23 or above (MySQLi supported)
      • -
    • PostgreSQL 7.3+
      • +
    • PostgreSQL 8.3+
    • SQLite 2.8.2+ (SQLite 3 is not supported)
    • Firebird 2.1+
    • MS SQL Server 2000 or above (directly or via ODBC or the native adapter)
      • diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 0e3a97c004..eb569d12d5 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -740,7 +740,7 @@ static private function f()

      2.iii. SQL/SQL Layout

      Common SQL Guidelines:

      -

      All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL3/4/5, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Firebird, SQLite, Oracle8, ODBC (generalised if possible)).

      +

      All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL3/4/5, MSSQL (7.0 and 2000), PostgreSQL (8.3+), Firebird, SQLite, Oracle8, ODBC (generalised if possible)).

      All SQL commands should utilise the DataBase Abstraction Layer (DBAL)

      SQL code layout:

      -- 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