aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developJoas Schilling2014-03-143-4/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-143-5/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | | | | | 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-142-14/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Add migration to drop postgres search indexesDhruv2014-03-121-0/+47
| | | | | | | | | | | | | | | | | | | | 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] 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 pull request #2109 from nickvergessen/ticket/11581Nathan Guse2014-03-131-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11581] Hide categories on level 0 when they have no visible children
| * | | | | | [ticket/11581] Hide categories when they have no visible childrenJoas Schilling2014-03-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | [ticket/12073] Increase size of samp and code tags in ACPMatt Friedman2014-03-131-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12073
* | | | | | Merge remote-tracking branch 'crizz0/ticket/8785' into developJoas Schilling2014-03-135-71/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/8785: [ticket/8785] Deletes additional add and add_bcc buttons [ticket/8785] Fixed problem with add empty.png and travis will now pass [ticket/8785] and again a fresh line [ticket/8785] Just one blank line [ticket/8785] pm_layout.html back to more standard code [ticket/8785] <hr /> will only displayed when needed [ticket/8785] Adds blank lines at file end [ticket/8785] Adds a new optical improvement, new file and fixes html bugs [ticket/8785] Adds two <hr /> to seperate recipients and BCC [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px [ticket/8785] Little spaces mistake [ticket/8785] Rebuilding posting_editor pm head + new language vars
| * | | | | | [ticket/8785] Deletes additional add and add_bcc buttonsCrizzo2014-03-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Fixed problem with add empty.png and travis will now passCrizzo2014-03-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] and again a fresh lineCrizzo2014-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Just one blank lineCrizzo2014-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] pm_layout.html back to more standard codeCrizzo2014-03-093-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] <hr /> will only displayed when neededCrizzo2014-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Adds blank lines at file endCrizzo2014-03-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Adds a new optical improvement, new file and fixes html bugsCrizzo2014-03-094-93/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Adds two <hr /> to seperate recipients and BCCCrizzo2014-03-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200pxCrizzo2014-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Little spaces mistakeCrizzo2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8785
| * | | | | | [ticket/8785] Rebuilding posting_editor pm head + new language varsCrizzo2014-03-033-36/+69
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-8785
* | | | | | Merge pull request #2110 from nickvergessen/ticket/12168Andreas Fischer2014-03-133-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12168] Move padding-top to ul.linklist li * nickvergessen/ticket/12168: [ticket/12168] Move padding-top to ul.linklist li
| * | | | | | [ticket/12168] Move padding-top to ul.linklist liJoas Schilling2014-03-113-2/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12168
* | | | | | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-138-10/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * | | | | | [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8041
| * | | | | | [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8041
| * | | | | | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-129-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8041