aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-06770-17759/+27936
|\
| * [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| * [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-025-6/+10
| * [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| * [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| * [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| * [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
| * [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| * Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
| |\
| | * [ticket/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| | * [ticket/11157] Fix remaining captcha spam.Oleg Pudeyev2012-10-295-14/+14
| | * [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
| * | Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
| |\ \
| | * | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| | |/
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-293-7/+13
| |\ \ | | |/ | |/|
| | * [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-292-1/+13
| | * [ticket/11158] Revert old fix in PHPBB3-10186.Oleg Pudeyev2012-10-291-6/+0
| * | [ticket/11156] Delete "Misc" tab of forum based permissions + move itemsRMcGirr832012-10-291-27/+26
| * | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2231-92/+163
| |\ \
| | * | [ticket/11014] Fix old pagination assignmentJoas Schilling2012-10-171-1/+0
| | * | [ticket/11018] Fix several paginations in ACPJoas Schilling2012-10-173-15/+19
| | * | [ticket/11014] Fix IF statements for new template paginationJoas Schilling2012-10-173-4/+4
| | * | [ticket/11014] Fix text for previous/next links in Subsilver2Joas Schilling2012-10-171-2/+2
| | * | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1719-29/+27
| | * | [ticket/11018] Always display previous/next links if we can display oneJoas Schilling2012-10-171-1/+1
| | * | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | * | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | * | [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the sameJoas Schilling2012-10-171-28/+52
| | * | [ticket/11018] Fix minor issues with CSS in prosilverJoas Schilling2012-10-172-5/+5
| | * | [ticket/11018] Attempt to fix li.pagination alignment issueDrae2012-10-171-0/+7
| * | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-184-26/+55
| |\ \ \
| | * | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | * | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| | * | | [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-033-6/+6
| | * | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | * | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-182-1/+36
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-182-1/+36
| | |\ \ \
| | | * | | [ticket/10848] Move include up.Oleg Pudeyev2012-10-171-1/+2
| | | * | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-172-2/+2
| | | * | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-172-1/+35
| * | | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-172-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-172-1/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-022-1/+3
| * | | | Merge PR #890 branch 'nickvergessen/ticket/10982' into developOleg Pudeyev2012-10-162-5/+5
| |\ \ \ \
| | * | | | [ticket/10982] Correctly check, whether data-overlay is setJoas Schilling2012-07-111-1/+1
| | * | | | [ticket/10982] Remove overlay on first up/down move of forums in ACPJoas Schilling2012-07-111-4/+4
| | * | | | [ticket/10982] Allow setting dimming control overlay also as data-overlayJoas Schilling2012-07-111-1/+1
| * | | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-164-5/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-164-5/+7
| | |\ \ \ \