aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developJoas Schilling2014-03-140-0/+0
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification() Conflicts: phpBB/includes/mcp/mcp_queue.php
| * Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympusJoas Schilling2014-03-141-2/+4
| |\ | | | | | | | | | | | | | | | * marcosbc/ticket/12247: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
| | * [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| | * [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-144-4/+111
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data Conflicts: phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympusJoas Schilling2014-03-144-5/+112
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * exreaction/ticket/12202: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data
| | * Merge pull request #11 from nickvergessen/ticket/exreaction/12202Nathan Guse2014-03-141-38/+44
| | |\ | | | | | | | | [ticket/12202] Use an array in the data provider instead of exploding manually
| | | * [ticket/12202] Use an array in the data provider instead of exploding manuallyJoas Schilling2014-03-141-38/+44
| | |/ | | | | | | | | | PHPBB3-12202
| | * [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | | | | | PHPBB3-12202
| | * [ticket/12202] Fix testsNathaniel Guse2014-03-091-5/+5
| | | | | | | | | | | | PHPBB3-12202
| | * [ticket/12202] Test for parse_cfg_fileNathan Guse2014-03-091-0/+97
| | | | | | | | | | | | PHPBB3-12202
| | * [ticket/12202] Use copyright symbol in style.cfg filesNathan Guse2014-03-092-3/+3
| | | | | | | | | | | | PHPBB3-12202
| | * [ticket/12202] Apply htmlspecialchars to style.cfg dataNathan Guse2014-03-091-3/+3
| | | | | | | | | | | | PHPBB3-12202
* | | Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241Dhruv Goel2014-03-141-1/+13
|\ \ \ | | | | | | | | [ticket/12241] Event to add and/or modify acp_board configurations
| * | | [ticket/12241] Add @var for the argumentsJoas Schilling2014-03-141-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Update event name and version match our guidelinesJoas Schilling2014-03-141-6/+4
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Add submit to event variablesForumhulp.com2014-03-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Move $phpbb_dispatcher to the topForumhulp.com2014-03-141-2/+1
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Event to add and/or modify acp_board configurationsForumhulp.com2014-03-141-0/+12
| | | | | | | | | | | | | | | | PHPBB3-12241
* | | | Merge remote-tracking branch 'dhruv/ticket/11040' into developJoas Schilling2014-03-144-18/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruv/ticket/11040: [ticket/11040] Topic is deleted if test is skipped [ticket/11040] Use unique text for the test post added [ticket/11040] Use hard delete in delete_topic [ticket/11040] Add migration to drop postgres search indexes [ticket/11040] Delete the functional test topic to avoid conflicts [ticket/11040] Add methods to delete post and topic in functional tests [ticket/11040] Swap post_text and post_subject for post_content index [ticket/11040] Add test cases for searching subject and post content together [ticket/11040] Remove postgres extra indexes [ticket/11040] Add post_content index [ticket/11040] Search subject and text together
| * | | | [ticket/11040] Topic is deleted if test is skippedDhruv2014-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Use unique text for the test post addedDhruv2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Use hard delete in delete_topicDhruv2014-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Add migration to drop postgres search indexesDhruv2014-03-121-0/+47
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Delete the functional test topic to avoid conflictsDhruv2014-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Add methods to delete post and topic in functional testsDhruv2014-03-121-0/+44
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Swap post_text and post_subject for post_content indexDhruv2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides better performance as per PostgreSQL Docs. PHPBB3-11040
| * | | | [ticket/11040] Add test cases for searching subject and post content togetherDhruv2014-03-121-4/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11040
| * | | | [ticket/11040] Remove postgres extra indexesDhruv2014-03-121-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove post_text index as post_content index is sufficient to search post text. PHPBB3-11040
| * | | | [ticket/11040] Add post_content indexDhruv2014-03-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to post_subject and post_title indexes add a post_content which is concatenation of both the columns. PHPBB3-11040
| * | | | [ticket/11040] Search subject and text togetherDhruv2014-03-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of searching for post_subject and post_text seperately and then OR them in where clause we use concatenation of the two columns and search PHPBB3-11040
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/12263' into developJoas Schilling2014-03-142-22/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12263: [ticket/12263] Add missing variable names to docblock fixes [ticket/12263] Remove invalid SQL query and unused variables [ticket/12263] Remove unused argument in module add/remove [ticket/12263] Fix incorrect docblock commets
| * | | | | [ticket/12263] Add missing variable names to docblock fixesMatt Friedman2014-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12263
| * | | | | [ticket/12263] Remove invalid SQL query and unused variablesMatt Friedman2014-03-131-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12263
| * | | | | [ticket/12263] Remove unused argument in module add/removeMatt Friedman2014-03-131-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12263
| * | | | | [ticket/12263] Fix incorrect docblock commetsMatt Friedman2014-03-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12263
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/10288' into developJoas Schilling2014-03-143-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/10288: [ticket/10288] Test to make sure included templates have proper variable scope
| * | | | | | [ticket/10288] Test to make sure included templates have proper variable scopeNathan Guse2014-03-133-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10288
* | | | | | | Merge pull request #2109 from nickvergessen/ticket/11581Nathan Guse2014-03-133-3/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11581] Hide categories on level 0 when they have no visible children
| * | | | | | | [ticket/11581] Add assertNotContainsLang() for functional test casesJoas Schilling2014-03-131-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
| * | | | | | | [ticket/11581] Hide categories when they have no visible childrenJoas Schilling2014-03-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
| * | | | | | | [ticket/11581] Fix year in copyright headerDhruv2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
| * | | | | | | [ticket/11581] Enabled private messages after testsDhruv2014-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
| * | | | | | | [ticket/11581] Add test to check UCP_PM is enabled/disabled correctlyDhruv2014-03-111-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11581
* | | | | | | | Merge remote-tracking branch 'crizz0/ticket/11787' into developJoas Schilling2014-03-141-43/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/11787: [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
| * | | | | | | | [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.phpCrizzo2014-03-131-43/+43
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11787
* | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12029' into developJoas Schilling2014-03-131-6/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12029: [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
| * | | | | | | | [ticket/12029] Remove ellipsis and wrap long sidebar items in ACPMatt Friedman2014-03-131-6/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12029
* | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11111' into developJoas Schilling2014-03-131-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11111: [ticket/11111] Prosilver posting textarea may only be resized vertically
| * | | | | | | | [ticket/11111] Prosilver posting textarea may only be resized verticallyMatt Friedman2014-03-131-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resize element displays a mechanism for allowing the user to resize the element. Setting this to vertical means it may only be resized vertically. PHPBB3-11111
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 07:01:16 +0000