aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.12' into develop-olympusNathaniel Guse2013-07-132-54/+115
|\
| * [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| * Merge remote-tracking branch 'remotes/naderman/ticket/11671' into prep-releas...Nathaniel Guse2013-07-132-58/+115
| |\
| | * [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-122-58/+115
| |/
* | [develop-olympus] Increment version number to 3.0.13-dev.Andreas Fischer2013-07-123-3/+3
|/
* [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
|\
| * [ticket/11668] Run lint test at the end of the test suiteIgor Wiedler2013-07-123-0/+12
|/
* Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into dev...Andreas Fischer2013-07-123-50/+51
|\
| * [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-123-50/+51
|/
* Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympusNathaniel Guse2013-07-125-7/+7
|\
| * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-125-7/+7
|/
* Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympusAndreas Fischer2013-07-112-1/+51
|\
| * [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-07-1153-307/+2205
| |\ | |/ |/|
* | [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
* | [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-o...Nathaniel Guse2013-07-113-1/+162
|\ \
| * | [ticket/10772] Remove unnecessary commentVjacheslav Trushkin2013-05-161-1/+0
| * | [ticket/10772] Functional tests for forum styleVjacheslav Trushkin2013-05-162-0/+154
| * | [ticket/10772] Use forum specific style for trigger_errorVjacheslav Trushkin2013-05-111-1/+9
* | | Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympusNathaniel Guse2013-07-111-1/+6
|\ \ \
| * | | [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6Igor Wiedler2013-07-111-1/+6
* | | | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-113-4/+43
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| * | | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-032-3/+4
| * | | [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| * | | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| * | | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
* | | | Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympusAndreas Fischer2013-07-111-52/+5
|\ \ \ \
| * | | | [ticket/11630] Improvements to the PHP lint pre-commit hookMatthew Fonda2013-07-061-52/+5
|/ / / /
* | | | Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympusNathan Guse2013-07-052-1/+76
|\ \ \ \
| * | | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| * | | | [ticket/11619] Some tests for get_remote_file().Andreas Fischer2013-07-031-0/+75
|/ / / /
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympusAndreas Fischer2013-07-031-0/+2
|\ \ \ \
| * | | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| * | | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
|/ / / /
* | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-...Joas Schilling2013-07-025-57/+169
|\ \ \ \
| * | | | [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| * | | | [ticket/11566] Remove extra pair of brackets from conditional statementDhruv2013-07-011-1/+1
| * | | | [ticket/11566] Check that guest doesn't have reporting permission by defaultDhruv2013-07-011-0/+4
| * | | | [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| * | | | [ticket/11566] Use the new constant CONFIRM_REPORT for captcha initDhruv2013-07-012-1/+2
| * | | | [ticket/11566] Rename var to $visual_confirmation_responseDhruv2013-07-011-3/+3
| * | | | [ticket/11566] Revert forum permission changesDhruv2013-07-011-3/+4
| * | | | [ticket/11566] Use language variable instead of hardcodeDhruv2013-07-011-1/+2
| * | | | [ticket/11566] add tests for reporting postDhruv2013-07-011-0/+55
| * | | | [ticket/11566] add captcha reset and hidden fieldsDhruv2013-07-011-0/+11