aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-1315-44/+44
|\ | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| * [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | PHPBB3-11112
| * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
| | | | | | | | PHPBB3-11112
* | Merge remote-tracking branch 'github-bantu/ticket/11674' into ↵Nils Adermann2013-07-131-13/+29
|\ \ | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-bantu/ticket/11674: [ticket/11674] Do not include vendor folder if there are no dependencies.
| * | [ticket/11674] Do not include vendor folder if there are no dependencies.Andreas Fischer2013-07-131-13/+29
| | | | | | | | | | | | PHPBB3-11674
* | | Merge remote-tracking branch 'github-bantu/ticket/11670' into ↵Nils Adermann2013-07-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | prep-release-3.0.12 * github-bantu/ticket/11670: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
|/ / | | | | | | PHPBB3-11670
* | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| | | | | | | | PHPBB3-11671
* | Merge remote-tracking branch 'remotes/naderman/ticket/11671' into ↵Nathaniel Guse2013-07-132-58/+115
|\ \ | |/ |/| | | | | | | | | | | | | prep-release-3.0.12 # By Nils Adermann # Via Nils Adermann * remotes/naderman/ticket/11671: [ticket/11671] Add phing as a dependency and upgrade deps
| * [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-122-58/+115
|/ | | | PHPBB3-11671
* [develop-olympus] Add changelog for 3.0.12 release.Andreas Fischer2013-07-121-20/+165
|
* [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-124-6/+6
|
* [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
|
* Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympusNathaniel Guse2013-07-123-0/+12
|\ | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11668: [ticket/11668] Run lint test at the end of the test suite
| * [ticket/11668] Run lint test at the end of the test suiteIgor Wiedler2013-07-123-0/+12
|/ | | | | | The lint test is very slow. Running it at the end should speed up the development cycle. PHPBB3-11668
* Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into ↵Andreas Fischer2013-07-123-50/+51
|\ | | | | | | | | | | | | develop-olympus * marc1706/ticket/11548-develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page
| * [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-123-50/+51
|/ | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
* Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympusNathaniel Guse2013-07-125-7/+7
|\ | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11662: [ticket/11662] Typos: occured -> occurred
| * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-125-7/+7
|/ | | | PHPBB3-11662
* Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympusAndreas Fischer2013-07-112-1/+51
|\ | | | | | | | | | | * marc1706/ticket/11548: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error
| * [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| | | | | | | | PHPBB3-11548
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-1153-307/+2205
| |\ | |/ |/| | | ticket/11548
* | [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
| | | | | | | | PHPBB3-10772
* | [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
| | | | | | | | PHPBB3-10772
* | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 03:05:07 +0000