aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-061002-18436/+35335
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-11-051-0/+0
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/11164] Update composer.phar
| | * Merge remote-tracking branch 'unknownbliss/ticket/111642' into develop-olympusAndreas Fischer2012-11-051-0/+0
| | |\ | | | | | | | | | | | | | | | | * unknownbliss/ticket/111642: [ticket/11164] Update composer.phar
| | | * [ticket/11164] Update composer.pharUnknown Bliss2012-11-041-0/+0
| | |/ | | | | | | | | | PHPBB3-11164
| * | Merge remote-tracking branch 'p/ticket/10933-lite' into developIgor Wiedler2012-11-0312-81/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10933-lite: [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/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| | | | | | | | | | | | | | | | PHPBB3-10933
| | * | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-028-9/+14
| | | | | | | | | | | | | | | | PHPBB3-10933
| | * | [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| | | | | | | | | | | | | | | | PHPBB3-10933
| | * | [ticket/10933] Specify empty template path for absolute includephp test.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably necessary all along, and the test happened to work because state was not correctly reset between test runs and a previous test set an empty template path. PHPBB3-10933
| | * | [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| | | | | | | | | | | | | | | | PHPBB3-10933
| | * | [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10933
| | * | [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no apparent reason for either initializing or clearing the context in set_style/set_custom_style. Initially the initialization there was added in 0501640d5db158a010741e27803191ab469834c4, for reasons that presently I do not see. This permits making context property back private. PHPBB3-10933
| * | Merge pull request #1028 from bantu/ticket/11099Oleg Pudeyev2012-11-011-2/+2
| |\ \ | | | | | | | | [ticket/11099] Mark acp_ban::display_ban_options() as static.
| | * | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| |/ / | | | | | | | | | | | | | | | It is called statically from mcp_ban. PHPBB3-11099
| * | Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11157: [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/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| | | | | | | | | | | | | | | | PHPBB3-11157
| | * | [ticket/11157] Fix remaining captcha spam.Oleg Pudeyev2012-10-295-14/+14
| | | | | | | | | | | | | | | | PHPBB3-11157
| | * | [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is specific to a particular captcha factory implementation, instantiate a captcha factory to invoke it. PHPBB3-11157
| * | | Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/11159-develop: [ticket/11159] static public is the currently approved order.
| | * | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| | |/ / | | | | | | | | | | | | PHPBB3-11159
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-293-7/+13
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. Conflicts: phpBB/install/database_update.php phpBB/ucp.php
| | * Merge remote-tracking branch 'p/ticket/11158' into develop-olympusAndreas Fischer2012-10-293-7/+13
| | |\ | | | | | | | | | | | | | | | | | | | | * p/ticket/11158: [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186.
| | | * [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-292-1/+13
| | | | | | | | | | | | | | | | PHPBB3-11158
| | | * [ticket/11158] Revert old fix in PHPBB3-10186.Oleg Pudeyev2012-10-291-6/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10186] UCP signature panel displays when not authed for signatures" This reverts commit f6fa52540c0fb20d79b4d59cb08c49484d9f3116. PHPBB3-10186 PHPBB3-11158
| * | Merge PR #1021 branch 'p/ticket/11156' into developOleg Pudeyev2012-10-291-27/+26
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/11156: [ticket/11156] Delete "Misc" tab of forum based permissions + move items
| | * | [ticket/11156] Delete "Misc" tab of forum based permissions + move itemsRMcGirr832012-10-291-27/+26
| |/ / | | | | | | | | | PHPBB3-11156
| * | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2231-92/+163
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11018: [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination [ticket/11014] Fix text for previous/next links in Subsilver2 [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 [ticket/11018] Always display previous/next links if we can display one [ticket/11014] Restore template vars for next/previous links [ticket/11018] Swap prev/next links on pagination to the old order [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same [ticket/11018] Fix minor issues with CSS in prosilver [ticket/11018] Attempt to fix li.pagination alignment issue
| | * | [ticket/11014] Fix old pagination assignmentJoas Schilling2012-10-171-1/+0
| | | | | | | | | | | | | | | | PHPBB3-11014
| | * | [ticket/11018] Fix several paginations in ACPJoas Schilling2012-10-173-15/+19
| | | | | | | | | | | | | | | | PHPBB3-11018
| | * | [ticket/11014] Fix IF statements for new template paginationJoas Schilling2012-10-173-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11014
| | * | [ticket/11014] Fix text for previous/next links in Subsilver2Joas Schilling2012-10-171-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11014
| | * | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1719-29/+27
| | | | | | | | | | | | | | | | PHPBB3-11023
| | * | [ticket/11018] Always display previous/next links if we can display oneJoas Schilling2012-10-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11018
| | * | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were dropped while the function was refactored: If the block_var_name is a nested block, we will use the last (most inner) block as a prefix for the template variables. If the last block name is pagination, the prefix is empty. If the rest of the block_var_name is not empty, we will modify the last row of that block and add our pagination items. PHPBB3-11014
| | * | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old pagination Prev was left of the pagination and Next right of the pagination. While moving these blocks, I also removed the whitespaces, which were introduced. PHPBB3-11023 PHPBB3-11018
| | * | [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the sameJoas Schilling2012-10-171-28/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-11067 PHPBB3-11018
| | * | [ticket/11018] Fix minor issues with CSS in prosilverJoas Schilling2012-10-172-5/+5
| | | | | | | | | | | | | | | | PHPBB3-11018
| | * | [ticket/11018] Attempt to fix li.pagination alignment issueDrae2012-10-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is somewhat kludgy fix for the vertical alignment issue for pagination contained within a linklist parented li element. Tested and doesn't seem to impact anything else negatively. May need further browser testing. PHPBB3-11018
| * | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-184-26/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8796: [ticket/8796] Prevent setting post_time greater than time() in markread [ticket/8796] Fix a few issues with the previous commits [ticket/8796] Mark read links updated to include time() in url [ticket/8796] Revert changes to $user->data['lastmark'] [ticket/8796] Make function markread obey the $post_time argument
| | * | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-8796
| | * | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an SQL error and the redirect url generated PHPBB3-8796
| | * | | [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-033-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submitting the current time() allows us to mark only the topics and forums read up until a certain time (when the user loaded the page). This means that any new posts or topics posted between when the user opened the page and clicked the link are still shown as unread. PHPBB3-8796
| | * | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier change might change the way some things work (after looking at viewtopic) and I'd rather not risk introducing new bugs, so I'm going to revert those changes to be safe. PHPBB3-8796
| | * | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also do a little cleanup of the markread function PHPBB3-8796
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-183-1/+80
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly. Conflicts: phpBB/includes/functions.php
| | * | | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-183-1/+80
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| | | * | | [ticket/10848] Move include up.Oleg Pudeyev2012-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | | * | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | | * | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-173-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| * | | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-172-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-26 04:10:01 +0000