aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-012-0/+11
|\
| * [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5
| * [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-013-3/+9
* | Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympusJoas Schilling2013-07-314-12/+42
|\ \
| * | [ticket/10037] Fix table in subsilver2Oliver Schramm2013-07-311-24/+18
| * | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
* | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-2/+19
|\ \ \
| * \ \ Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| |\ \ \
| | * | | [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | * | | [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
| | | |/ | | |/|
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12Joas Schilling2013-07-301-1/+2
| |\ \ \
| | * | | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| | |/ /
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| |/ /
* | | [ticket/10917] Variable used only once so delete itOliver Schramm2013-07-281-7/+1
* | | [ticket/10917] Revert use of phpbb wrapperOliver Schramm2013-07-271-1/+1
* | | Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-oly...Nathaniel Guse2013-07-251-1/+1
|\ \ \
| * | | [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| * | | [ticket/10917] Fixed notice that files are out of date when updating to an un...Oliver Schramm2013-07-241-1/+1
* | | | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-oly...Nathaniel Guse2013-07-251-1/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| * | | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| |/ /
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
|\ \ \ | |/ / |/| / | |/
| * [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-221-3/+6
|\ \ | |/
| * Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-r...Andreas Fischer2013-07-221-3/+6
| |\
| | * [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
* | | 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-1/+1
|\ \ \ | |/ /
| * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
* | | 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
| * | [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-123-5/+5
* [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
* [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
* [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-6/+6
* Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-07-1120-104/+248
|\
| * Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-o...Nathaniel Guse2013-07-111-1/+8
| |\
| | * [ticket/10772] Remove unnecessary commentVjacheslav Trushkin2013-05-161-1/+0
| | * [ticket/10772] Use forum specific style for trigger_errorVjacheslav Trushkin2013-05-111-1/+9