aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-013-2/+13
|\
| * [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-014-5/+11
* | 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
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12Joas Schilling2013-07-301-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| |/ /
* | | Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympusJoas Schilling2013-07-301-8/+2
|\ \ \
| * | | [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
|\ \ \ | |/ / |/| / | |/
| * 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
| |\ \ \ | | |/ / | |/| |