| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-9550
|
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
PHPBB3-9550
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Order extensions in mock extension manager.
[feature/template-events] Changes per imkingdavid's review.
[feature/template-events] Make style names private on template.
[feature/template-events] Test for event that is defined in parent style only.
[feature/template-events] Specify style names, add inheritance tests.
[feature/template-events] Normalize expected directory trees.
[feature/template-events] Allow dataset to be correctly selectable.
[feature/template-events] Dataset for template event testing with inheritance.
[feature/template-events] Use style names array in template filter.
[feature/template-events] Generate style names array in set_style.
[feature/template-events] Convert a single style name to array of them.
[feature/template-events] Chase dependency injection for template context.
[feature/template-events] Adjust template events test to use the dataset.
[feature/template-events] Create a dataset for template event tests.
[feature/template-events] Indentation fix.
[feature/template-events] Cosmetic changes.
[feature/template-events] Wording: wrongly -> improperly.
[feature/template-events] Indentation fix.
[feature/template-events] Rename template_name to style_name.
...
|
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This allows template code to know the entire style hierarchy for
templates being rendered.
PHPBB3-9550
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|