| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
The disable images need to be clone rather then moved, in order to allow
multiple disable images per page. We do not have such a case at the moment
but it will be required for the new teampage/legend ACP section.
PHPBB3-11209
|
|
|
|
| |
PHPBB3-11198
|
|
|
|
| |
PHPBB3-11198
|
|
|
|
| |
PHPBB3-11198
|
|
|
|
| |
PHPBB3-10780
|
|
|
|
|
|
| |
Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates
PHPBB3-10780
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
|
| |
| |
| |
| | |
PHPBB3-11018
|
| |
| |
| |
| |
| | |
PHPBB3-11067
PHPBB3-11018
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/10982:
[ticket/10982] Correctly check, whether data-overlay is set
[ticket/10982] Remove overlay on first up/down move of forums in ACP
[ticket/10982] Allow setting dimming control overlay also as data-overlay
|
| | |
| | |
| | |
| | | |
PHPBB3-10982
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/11093] acp_users_overview.html has a wrongly placed </dd>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Amended the closing dd tag to the appropriate line: line 145 instead of 141
PHPBB3-11093
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* mvinny/ticket/11139:
[ticket/11139] Adding the $phpbb_admin_path variable
[ticket/11139] Fix fatal error on colour swatch window
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11139
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11139
|
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/11135] Full replacement of credit link to https
Conflicts:
phpBB/install/convertors/convert_phpbb20.php
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11135
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11112
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Turn the blocks red on the details page if requirement is not met.
Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add Back button from details
Add cancel button from actions
Correct language strings
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
simplified validation
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10631
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
Conflicts:
phpBB/includes/acp/acp_profile.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.
PHPBB3-10965
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11008
|
| |\ \ \
| | | | |
| | | | | |
Feature/new tz handling
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | | |
feature/new-tz-handling
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9558
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9558
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9558
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9558
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
feature/new-tz-handling
Conflicts:
phpBB/includes/functions_profile_fields.php
phpBB/includes/session.php
phpBB/install/database_update.php
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-9558
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
|
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
|