| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
PHPBB3-10411
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[ticket/11200] Make cache available during container construction
[ticket/11199] Match cache purge container files against container_*
[ticket/11199] Purge dumped container correctly on cache purge.
[ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
[ticket/11199] Cache purge does not remove dumped container
[ticket/11198] Store the swapping partners in vars and simplify the logic
[ticket/11198] Correctly set links after an item is moved up/down with AJAX
[ticket/11197] Prefix the css classes for the small arrow with "arrow"
[ticket/10879] Remove arrow icon from attachment link in editor
[ticket/11195] Condense logic, remove improperly formatted if()
[ticket/11194] Service tag data is stored in an array so access it correctly
[ticket/11193] Instantiate a single collection_pass for all collections
[ticket/11190-develop] Functional tests purge cache before running.
[ticket/11190] Functional tests purge cache before running.
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
PHPBB3-10411
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
PHPBB3-10411
|
| | | | |_|_|/ / / / / / / /
| | |/| | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
PHPBB3-10411
|
| | | |_|/ / / / / / / / /
| |/| | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Currently no custom template from the ACP uses AJAX support.
PHPBB3-11166
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
PHPBB3-11314
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
This time without changing the behavior.
PHPBB3-11314
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.
PHPBB3-11314
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / /
| |/| | | | | | | | | | |
|
| | | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
PHPBB3-11318
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d972b93ef5a98b0d1d97a2a970d684f
- 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.
PHPBB3-11201
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.
PHPBB3-11201
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
PHPBB3-11314
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
PHPBB3-11314
|
| |/ / / / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Omitting the semi-colon is not legal behavior for JavaScript.
PHPBB3-11314
|
| | |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
A few missing semi-colons were also added where needed.
PHPBB3-10949
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
|
| | |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-11259
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
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
|