Adds the append counterpart of a template event required for the karma
extension. It allows adding data after the custom fields under the username
and avatar next to every post.
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.
PHPBB3-9550
Adds a template event required for the karma extension. It allows adding data
before the custom fields, under the username and avatar next to every post.
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows users
to see how respected the post author is.
PHPBB3-9550
Adds the prepend counterpart of a template event required for the karma
extension. It allows adding post buttons to posts (next to the quote and edit
buttons).
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.
PHPBB3-9550
Adds a template event required for the karma extension. It allows adding
post buttons to posts (next to the quote and edit buttons).
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add thumbs up/down icons that allow users to
give karma on posts.
PHPBB3-9550
Adds the append counterpart of a template event required for the karma
extension. It allows adding entries to the user statistics part of any user
profile.
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.
PHPBB3-9550
Adds a template event required for the karma extension. It allows adding
entries to the user statistics part of any user profile.
Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected this user is. Prepend because karma score is often
a more meaningful statistic than the bottom statistics (like "Most active
topic"), and should therefore be more prominent.
PHPBB3-9550
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
* phpbb/develop: (704 commits)
[ticket/11630] Improvements to the PHP lint pre-commit hook
[feature/auth-refactor] Move auth providers to separate directory
[ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
[ticket/11619] Some tests for get_remote_file().
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[ticket/10838] Fix URL for wiki and remove irrelevant line
[ticket/10838] Remove php 5.4 and builtin server references
[ticket/10838] Fix missing data
[ticket/10838] separate database used mentioned in unit tests
[ticket/11585] Make $auth_admin class property
[feature/auth-refactor] A possible fix for the functional test failures
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
...
Conflicts:
phpBB/docs/sphinx.sample.conf
phpBB/feed.php
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[feature/auth-refactor] A possible fix for the functional test failures
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
...
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention
PHPBB3-11598
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.
PHPBB3-11598
* ticket/11566:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
Conflicts:
phpBB/report.php
Was:
<!-- INCLUDEJS template/foo.js -->
Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->
Reasons for this:
1. INCLUDEJS is 3.1-dev only
2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)
3. INCLUDEJS could not include files from outside directories or anywhere
else
4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.
PHPBB3-11598
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/editor-code-tabs:
[feature/editor-code-tabs] Make inTag function reusable
[feature/editor-code-tabs] Check for browser support in function
[feature/editor-code-tabs] Apply code editor to everything
[feature/editor-code-tabs] Correctly count indentation on first line