aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
| | | | PHPBB3-10037
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
|\ | | | | | | | | * prep-release-3.0.12: [ticket/11740] Update FAQ to include Ideas Centre
| * Merge remote-tracking branch 'unknownbliss/ticket/11740' into ↵Andreas Fischer2013-07-251-1/+1
| |\ | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * unknownbliss/ticket/11740: [ticket/11740] Update FAQ to include Ideas Centre
| | * [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| |/ | | | | | | PHPBB3-11740
* | Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympusAndreas Fischer2013-07-231-3/+0
|\ \ | | | | | | | | | | | | * EXreaction/ticket/11726: [ticket/11726] Don't run lint tests on Travis on postgres
| * | [ticket/11726] Don't run lint tests on Travis on postgresNathan Guse2013-07-221-3/+0
|/ / | | | | | | PHPBB3-11726
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-222-10/+18
|\ \ | |/ | | | | | | | | * prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| * Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into ↵Andreas Fischer2013-07-222-10/+18
| |\ | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * marc1706/ticket/11720-prep-release: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | * [ticket/11720] Add functional test for submitting report as userMarc Alexander2013-07-211-7/+12
| | | | | | | | | | | | | | | | | | | | | The already existing functional tests were not ran as the filename was missing the appended "_test". PHPBB3-11720
| | * [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11566 changed big parts of code. Unfortunately, a call to $captcha->validate was added that is being called even if $captcha hasn't been initialized. This change will fix this issue. PHPBB3-11720
* | | Merge pull request #1567 from bantu/ticket/11704Nils Adermann2013-07-141-2/+2
|\ \ \ | | | | | | | | [ticket/11704] phing build script does not include vendor folder, even if there are dependencies
| * | | [ticket/11704] Use the correct directory for dependency checking.Andreas Fischer2013-07-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11704
| * | | [ticket/11704] Correctly escape "Andreas Fischer2013-07-141-1/+1
|/ / / | | | | | | | | | PHPBB3-11704
* | | Merge remote-tracking branch 'github-exreaction/ticket/11686' into ↵Nils Adermann2013-07-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/11686: [ticket/11686] Not checking for phpBB Debug errors on functional tests
| * | | [ticket/11686] Not checking for phpBB Debug errors on functional testsNathaniel Guse2013-07-131-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11686
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] More changelog items for the 3.0.12 release.
| * | | [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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| * | | 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 branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-13/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11674] Do not include vendor folder if there are no dependencies.
| * | | 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 branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * prep-release-3.0.12: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | | 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
* | | Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into ↵Nathaniel Guse2013-07-132-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11668-travis: [ticket/11668] Move lint test to the end for travis
| * | | [ticket/11668] Move lint test to the end for travisIgor Wiedler2013-07-122-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11668
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusNathaniel Guse2013-07-132-54/+115
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | # By Nathaniel Guse (1) and Nils Adermann (1) * prep-release-3.0.12: [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps
| * | | [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] 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
|\ \ | |/ |/| | | | | | | | | # 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 20:11:33 +0000