diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-10 16:19:39 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-10 16:19:39 -0400 |
| commit | 18f6a161017f5350d9487181f4b4ed66a53a0284 (patch) | |
| tree | 5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/docs | |
| parent | 3f81057f96ae87d2a881f5c71be1816c703cb1fd (diff) | |
| parent | 71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff) | |
| download | forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.gz forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.bz2 forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.xz forums-18f6a161017f5350d9487181f4b4ed66a53a0284.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 4 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 60 |
2 files changed, 63 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index bb42736daf..c2eb48137a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -145,7 +145,6 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11265">PHPBB3-11265</a>] - Functional tests do not assert that board installation succeeded</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11269">PHPBB3-11269</a>] - Travis functional test case errors</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11278">PHPBB3-11278</a>] - Firebird tables are not removed correctly on 3.0.9-rc1 update</li> -<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11288">PHPBB3-11288</a>] - Search fooled by hyphens</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11291">PHPBB3-11291</a>] - "Could not open input file: ../composer.phar" error during phing's create-package</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11292">PHPBB3-11292</a>] - Newlines removed in display of PM reports, no clickable links in PM reports</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11301">PHPBB3-11301</a>] - "String offset cast occured" error on PHP 5.4</li> @@ -185,6 +184,9 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11674">PHPBB3-11674</a>] - Do not include vendor folder if there are no dependencies.</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11524">PHPBB3-11524</a>] - MySQL Upgrader throws warnings on PHP 5.4</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11720">PHPBB3-11720</a>] - Reporting posts leads to white page error</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11769">PHPBB3-11769</a>] - Wrong poster in subscription email when poster is using the Quote button</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11775">PHPBB3-11775</a>] - Error while moving posts to a new topic</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11802">PHPBB3-11802</a>] - Undefined variable $browser in /download/file.php</li> </ul> <h4>Improvement</h4> <ul> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index af6e6bdb1c..bef4727149 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -179,6 +179,66 @@ ucp_pm_viewmessage_print_head_append * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html * Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen +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 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 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 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 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 block of the Edit +Display Options screen + +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 block of the Edit +Display Options screen + +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 lists block of the Edit +Display Options screen + +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 lists block of the Edit +Display Options screen + viewtopic_print_head_append === * Location: styles/prosilver/template/viewtopic_print.html |