summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-02-16Merge upstream branchAndrey Andreev5-12/+14
2012-02-16Merge pull request #934 from wilburhimself/developPhil Sturgeon1-1/+1
2012-02-16Merge pull request #1046 from YorickPeterse/developPhil Sturgeon1-1/+1
2012-02-16Merge pull request #1040 from narfbg/develop-issue-1039Phil Sturgeon3-10/+12
2012-02-15Lowered the file permissions for file caches.Yorick Peterse1-1/+1
2012-02-14Fix another issueAndrey Andreev1-1/+1
2012-02-14Fix issue #1039Andrey Andreev3-9/+11
2012-02-14Merge remote-tracking branch 'upstream/develop' into develop-db-driverAndrey Andreev3-252/+201
2012-02-13Merge pull request #921 from narfbg/develop-image-libPhil Sturgeon2-249/+189
2012-02-13Merge pull request #1037 from timw4mail/developPhil Sturgeon1-4/+6
2012-02-13Added missing spaceTimothy Warren1-1/+1
2012-02-13Re-added if ! empty clauseTimothy Warren1-1/+4
2012-02-13Refixed Old-style pdo connection stringTimothy Warren1-7/+6
2012-02-13Merge pull request #1034 from toopay/pdo_old_hostnamePhil Sturgeon1-5/+8
2012-02-13Semicolon automatically added if not exists after hostname, if only database ...Taufan Aditya1-2/+7
2012-02-13Fix issue #1036Andrey Andreev2-1/+2
2012-02-13Fix a changelog entryAndrey Andreev1-1/+1
2012-02-13Fix a possible bug in DB() and renamed a variableAndrey Andreev2-10/+14
2012-02-12Fixed rtrim issue in hostname fragment, for backward compabilityTaufan Aditya1-5/+3
2012-02-12Merge pull request #1026 from timw4mail/developPhil Sturgeon1-1/+5
2012-02-10Changed double quotes to singleTimothy Warren1-1/+1
2012-02-10Fixed old-style pdo connection stringTimothy Warren1-1/+5
2012-02-10Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev9-95/+296
2012-02-10Merge upstream branchAndrey Andreev9-83/+283
2012-02-10Merge pull request #1022 from toopay/pdoPhil Sturgeon8-93/+294
2012-02-10Grammar correctionTaufan Aditya1-1/+1
2012-02-09Merge pull request #1024 from narfbg/develop-issue-1021Eric Barnes1-2/+2
2012-02-09Fix link to changelogAndrey Andreev1-2/+2
2012-02-09TypoTaufan Aditya1-1/+1
2012-02-09Change PHP.net mirror to the main mirrorTaufan Aditya1-2/+2
2012-02-09Added database.phpTaufan Aditya1-0/+2
2012-02-09Fixed PDOTaufan Aditya7-93/+292
2012-02-08Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev4-37/+36
2012-02-08Merge upstream branchAndrey Andreev4-37/+36
2012-02-08Merge pull request #1018 from narfbg/develop-inputPhil Sturgeon2-37/+30
2012-02-08Remove a few spacesAndrey Andreev1-2/+2
2012-02-08Fix CI_Input::is_ajax_request()Andrey Andreev2-37/+30
2012-02-06Merge pull request #1016 from kevincupp/developGreg Aker3-0/+6
2012-02-05Adding in a few 503 status codes for common errors in response to this Expres...Kevin Cupp3-0/+6
2012-02-02Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev2-56/+78
2012-02-02Merge upstream branchAndrey Andreev2-56/+78
2012-02-02Merge pull request #942 from narfbg/develop-issue-154Phil Sturgeon2-56/+78
2012-02-01Merge upstreamAndrey Andreev2-1/+2
2012-02-01Merge upstreamAndrey Andreev16-825/+474
2012-02-01Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev17-825/+475
2012-02-01Merge pull request #1006 from duggan/patch-1Phil Sturgeon2-1/+2
2012-02-01Add note about HTTPS detection change to 3.0 changelogRoss Duggan1-0/+1
2012-01-31HTTPS detection fixRoss Duggan1-1/+1
2012-01-27Removed a few more unnecessary linesAndrey Andreev1-9/+2
2012-01-27Merge remote-tracking branch 'upstream/develop' into develop-db-driverAndrey Andreev13-733/+425