aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into ↵Nathaniel Guse2013-07-113-1/+162
|\ | | | | | | | | | | | | | | | | | | | | develop-olympus # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10772: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style [ticket/10772] Use forum specific style for trigger_error
| * [ticket/10772] Remove unnecessary commentVjacheslav Trushkin2013-05-161-1/+0
| | | | | | | | PHPBB3-10772
| * [ticket/10772] Functional tests for forum styleVjacheslav Trushkin2013-05-162-0/+154
| | | | | | | | PHPBB3-10772
| * [ticket/10772] Use forum specific style for trigger_errorVjacheslav Trushkin2013-05-111-1/+9
| | | | | | | | PHPBB3-10772
* | Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympusNathaniel Guse2013-07-111-1/+6
|\ \ | | | | | | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11644: [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
| * | [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6Igor Wiedler2013-07-111-1/+6
| | | | | | | | | | | | PHPBB3-11644
* | | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-113-4/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| | | | | | | | | | | | PHPBB3-8319
| * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-032-3/+4
| | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
| * | [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| | | | | | | | | | | | | | | | | | | | | To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the second_pass_replace value, so that needs updating for existing ones. PHPBB3-8319
| * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | | | | | | | | | | | PHPBB3-8319
| * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | The description says: "The URL must be relative to the topic page and cannot contain a server name or protocol." We now enforce this and will add a new token with the current behaviour back. PHPBB3-8319
* | | Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympusAndreas Fischer2013-07-111-52/+5
|\ \ \ | | | | | | | | | | | | | | | | * EXreaction/ticket/11630: [ticket/11630] Improvements to the PHP lint pre-commit hook
| * | | [ticket/11630] Improvements to the PHP lint pre-commit hookMatthew Fonda2013-07-061-52/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The PHP lint pre-commit hook fails to display any output when an error other than a parse error is decteced. Additionally, the hook may not display any meaningful output depending on php.ini settings. This commit removes the dependency on php.ini. PHPBB3-11630
* | | Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympusNathan Guse2013-07-052-1/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11619: [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file().
| * | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11619
| * | | [ticket/11619] Some tests for get_remote_file().Andreas Fischer2013-07-031-0/+75
|/ / / | | | | | | | | | PHPBB3-11619
* | | Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympusAndreas Fischer2013-07-031-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/11617: [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php
| * | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11617
| * | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
|/ / / | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11617 PHPBB3-11617
* | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into ↵Joas Schilling2013-07-025-57/+169
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/dhruvgoel92/ticket/11566: [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha
| * | | [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11561
| * | | [ticket/11566] Remove extra pair of brackets from conditional statementDhruv2013-07-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Check that guest doesn't have reporting permission by defaultDhruv2013-07-011-0/+4
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Use the new constant CONFIRM_REPORT for captcha initDhruv2013-07-012-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Rename var to $visual_confirmation_responseDhruv2013-07-011-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Revert forum permission changesDhruv2013-07-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Revert the f_report permission for guests in the functional tests PHPBB3-11566
| * | | [ticket/11566] Use language variable instead of hardcodeDhruv2013-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add language variable in tests PHPBB3-11566
| * | | [ticket/11566] add tests for reporting postDhruv2013-07-011-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Functional test for reporting post and check if captcha validation is required for guests and not for registerted users PHPBB3-11566
| * | | [ticket/11566] add captcha reset and hidden fieldsDhruv2013-07-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If captcha is solved and some other error pops up, store the captcha in a hidden field. Reset captcha if reporting the post is successful PHPBB3-11566
| * | | [ticket/11566] display error instead of trigger_errorDhruv2013-07-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the error report is empty display error in the template instead of trigger_error PHPBB3-11566
| * | | [ticket/11566] add error in templateDhruv2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if error exists, then display it in the report post template. PHPBB3-11566
| * | | [ticket/11566] add error functionalityDhruv2013-07-011-67/+80
| | | | | | | | | | | | | | | | | | | | | | | | add $error which stores the captcha error when captcha validation fails PHPBB3-11566
| * | | [ticket/11566] add interface for captchaDhruv2013-07-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic captcha template while reporting post when the user is not a registered user. PHPBB3-11566
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympusAndreas Fischer2013-07-011-4/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10838: [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/10838] Updated RUNNING_TESTS.md
| * | | | [ticket/10838] Fix URL for wiki and remove irrelevant lineDhruv2013-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10838
| * | | | [ticket/10838] Remove php 5.4 and builtin server referencesDhruv2013-07-021-7/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10838
| * | | | [ticket/10838] Fix missing dataDhruv2013-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10838
| * | | | [ticket/10838] separate database used mentioned in unit testsDhruv2013-07-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate database used for tests which is deleted each time tests are run information is added to unit tests. PHPBB3-10838
| * | | | [ticket/10838] Updated RUNNING_TESTS.mdDhruv2013-06-271-0/+36
| |/ / / | | | | | | | | | | | | PHPBB3-10838
* | | | Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympusAndreas Fischer2013-06-271-4/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Hardolaf/ticket/11618: [ticket/11618] Replace glob() with scandir() and string matching
| * | | | [ticket/11618] Replace glob() with scandir() and string matchingJoseph Warner2013-06-261-4/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Removes glob from template tests as glob() does not work on all systems according to PHP documentation as has been noticed by users. PHPBB3-11618
* | | | Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into ↵Andreas Fischer2013-06-271-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * asperous/ticket/11615/creation_test: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity
| * | | [ticket/11615] Fix typo in creation_testAndy Chase2013-06-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11615
| * | | [ticket/11615] Remove magic number in creation_testAndy Chase2013-06-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this magic number to its own variable with clean multiplication makes it clear what the number represents. PHPBB3-11615
| * | | [ticket/11615] Rename class in file to matchAndy Chase2013-06-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11615
| * | | [ticket/11615] Rename init_test to creation_test for clarityAndy Chase2013-06-261-0/+0
| | | | | | | | | | | | | | | | PHPBB3-11615
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10776: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html.
| * | | | [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776