aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympusNils Adermann2014-05-022-7/+6
|\
| * [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.Andreas Fischer2014-05-021-3/+4
| * Merge pull request #2371 from nickvergessen/ticket/12467Andreas Fischer2014-05-021-4/+2
| |\ |/ /
| * [ticket/12467] Add config*.php and tests_config*.php to .gitignoreJoas Schilling2014-05-021-4/+2
|/
* Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into devel...Nils Adermann2014-05-022-2/+2
|\
| * [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-142-2/+2
* | Merge pull request #2319 from n-aleha/ticket/12186Joas Schilling2014-04-292-1/+40
|\ \
| * | [ticket/12186] Move PM reports below post reports while installingn-aleha2014-04-232-1/+40
* | | Merge pull request #2341 from nickvergessen/ticket/12413Andreas Fischer2014-04-221-70/+9
|\ \ \
| * | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0Joas Schilling2014-04-221-70/+9
|/ / /
* | | Merge pull request #2324 from bantu/ticket/12417Joas Schilling2014-04-161-0/+2
|\ \ \ | |/ / |/| |
| * | [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."Andreas Fischer2014-04-161-0/+2
|/ /
* | Merge pull request #2310 from n-aleha/ticket/12397Andreas Fischer2014-04-151-2/+2
|\ \
| * | [ticket/12397] Fix sql_unique_index_exists doc blockn-aleha2014-04-161-2/+2
| |/
* | Merge pull request #2195 from Elsensee/ticket/10423Joas Schilling2014-04-154-15/+66
|\ \ | |/ |/|
| * [ticket/10423] Replace foreach with function in viewtopic.phpOliver Schramm2014-04-151-12/+5
| * [ticket/10423] Remove unnecessary include in testOliver Schramm2014-04-151-1/+0
| * [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-132-2/+4
| * [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-134-5/+60
| * [ticket/10423] Remove * from search or highlight stringOliver Schramm2014-03-282-5/+7
* | Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympusCesar G2014-04-101-1/+1
|\ \
| * | [ticket/10687] Improve error message if unable to get image dimensionsMarc Alexander2014-04-091-1/+1
* | | Merge pull request #2279 from Elsensee/ticket/12381Andreas Fischer2014-04-101-1/+1
|\ \ \
| * | | [ticket/12381] Fix broken error message when selecting invalid DB driverOliver Schramm2014-04-101-1/+1
|/ / /
* | | Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympusJoas Schilling2014-04-102-3/+1
|\ \ \ | |/ / |/| |
| * | [ticket/12320] Install a nightly build of HHVM.Andreas Fischer2014-04-101-1/+1
| * | [ticket/12320] No longer allow Travis CI HHVM environment to fail.Andreas Fischer2014-04-101-2/+0
|/ /
* | Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympusAndreas Fischer2014-04-061-3/+3
|\ \
| * | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
|/ /
* | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
|\ \
| * | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
* | | Merge remote-tracking branch 'Elsensee/ticket/12353' into develop-olympusJoas Schilling2014-04-041-1/+1
|\ \ \
| * | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
|/ / /
* | | Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympusJoas Schilling2014-04-031-2/+1
|\ \ \ | |/ / |/| |
| * | [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."Andreas Fischer2014-04-031-2/+1
* | | Merge remote-tracking branch 'Elsensee/ticket/12341' into develop-olympusJoas Schilling2014-04-031-0/+125
|\ \ \ | |/ / |/| |
| * | [ticket/12341] Add tests for get_username_string()Oliver Schramm2014-04-011-0/+125
|/ /
* | Merge remote-tracking branch 'bantu/ticket/12318-olympus' into develop-olympusJoas Schilling2014-03-311-29/+54
|\ \
| * | [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.Andreas Fischer2014-03-301-0/+4
| * | [ticket/12318] Pin HHVM version to 3.0.0~precise.Andreas Fischer2014-03-301-1/+2
| * | [ticket/12318] Always install new config file on HHVM upgrade conflict.Andreas Fischer2014-03-301-1/+1
| * | [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.Andreas Fischer2014-03-301-0/+6
| * | [ticket/12318] Upgrade to a recent stable version of HHVM.Andreas Fischer2014-03-301-0/+3
| * | [ticket/12318] Correctly setup HHVM for functional tests.Andreas Fischer2014-03-301-29/+40
|/ /
* | Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympusAndreas Fischer2014-03-301-3/+5
|\ \
| * | [ticket/12316] Add Build Status Icon for develop-ascraeus to README.mdMatt Friedman2014-03-301-3/+5
|/ /
* | Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympusJoas Schilling2014-03-291-0/+3
|\ \
| * | [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.Andreas Fischer2014-03-291-0/+3
|/ /
* | Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into develop-ol...Joas Schilling2014-03-294-338/+448
|\ \ | |/ |/|
| * [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4