aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
|\
| * Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3....Andreas Fischer2013-07-251-1/+1
| |\
| | * [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| |/
* | Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympusAndreas Fischer2013-07-231-3/+0
|\ \
| * | [ticket/11726] Don't run lint tests on Travis on postgresNathan Guse2013-07-221-3/+0
|/ /
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-222-10/+18
|\ \ | |/
| * Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-r...Andreas Fischer2013-07-222-10/+18
| |\
| | * [ticket/11720] Add functional test for submitting report as userMarc Alexander2013-07-211-7/+12
| | * [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
* | | Merge pull request #1567 from bantu/ticket/11704Nils Adermann2013-07-141-2/+2
|\ \ \
| * | | [ticket/11704] Use the correct directory for dependency checking.Andreas Fischer2013-07-141-1/+1
| * | | [ticket/11704] Correctly escape "Andreas Fischer2013-07-141-1/+1
|/ / /
* | | Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-ol...Nils Adermann2013-07-131-0/+1
|\ \ \
| * | | [ticket/11686] Not checking for phpBB Debug errors on functional testsNathaniel Guse2013-07-131-0/+1
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-1315-44/+44
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release...Nils Adermann2013-07-1315-44/+44
| |\ \ \
| | * | | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | * | | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
| | | |/ | | |/|
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-13/+29
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3....Nils Adermann2013-07-131-13/+29
| |\ \ \
| | * | | [ticket/11674] Do not include vendor folder if there are no dependencies.Andreas Fischer2013-07-131-13/+29
* | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3....Nils Adermann2013-07-131-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| |/ /
* | | Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into develop...Nathaniel Guse2013-07-132-0/+8
|\ \ \
| * | | [ticket/11668] Move lint test to the end for travisIgor Wiedler2013-07-122-0/+8
* | | | 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