summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-db-odbcAndrey Andreev6-84/+221
2012-02-29Improved plural() and singular().Phil Sturgeon2-56/+98
Avoids double-pluralization using "uncountable words" and better logic.
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon5-28/+123
2012-02-28Merge upstream branchAndrey Andreev3-46/+28
2012-02-28Merge pull request #1089 from narfbg/develop-issue-177Andrey Andreev2-28/+15
Fix issue #177
2012-02-28Replace AND with &&Andrey Andreev1-1/+1
2012-02-28Fix issue #177Andrey Andreev2-28/+15
2012-02-27Merge pull request #1086 from narfbg/develop-commonAndrey Andreev1-18/+13
Just some style changes and removed a useless check
2012-02-27Just some style changes and removed a useless checkAndrey Andreev1-18/+13
2012-02-24Merge upstream branchAndrey Andreev6-14/+67
2012-02-24Merge pull request #1069 from narfbg/develop-db-selectAndrey Andreev6-14/+67
Add an optional database name parameter to db_select()
2012-02-24Update database property when switching to a new oneAndrey Andreev4-4/+48
2012-02-22Merge upstream branchAndrey Andreev4-32/+12
2012-02-22Merge pull request #1072 from narfbg/develop-issue-1070Andrey Andreev2-24/+11
Fix issue #1070
2012-02-22Fix issue 1070Andrey Andreev2-24/+11
2012-02-22Add an optional database name parameter to db_select()Andrey Andreev6-14/+23
2012-02-17Merge pull request #1051 from toopay/mysql_utilPhil Sturgeon1-1/+1
Syntax error, causing MySQL utility could not be used
2012-02-17Syntax error, causing MySQL utility could not usedTaufan Aditya1-1/+1
2012-02-17Merge pull request #1050 from marcosgdf/developPhil Sturgeon1-7/+0
Can you add this to the changelog please?
2012-02-17Fixed issue #960Marcos Garcia1-7/+0
2012-02-16Merge upstream branchAndrey Andreev5-12/+14
2012-02-16Merge pull request #934 from wilburhimself/developPhil Sturgeon1-1/+1
Fixed error in inflector_helper.php in the singular function.
2012-02-16Merge pull request #1046 from YorickPeterse/developPhil Sturgeon1-1/+1
Lowered the file permissions for file caches.
2012-02-16Merge pull request #1040 from narfbg/develop-issue-1039Phil Sturgeon3-10/+12
Fix issue #1039
2012-02-15Lowered the file permissions for file caches.Yorick Peterse1-1/+1
See #1045 for more information. Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2012-02-14Fix another issueAndrey Andreev1-1/+1
2012-02-14Fix issue #1039Andrey Andreev3-9/+11
2012-02-14Fix issue #81Andrey Andreev2-8/+15
2012-02-14Merge remote-tracking branch 'upstream/develop' into develop-db-odbcAndrey Andreev3-252/+201
2012-02-13Merge pull request #921 from narfbg/develop-image-libPhil Sturgeon2-249/+189
Image_lib::image_reproportion() to not need both width and height
2012-02-13Merge pull request #1037 from timw4mail/developPhil Sturgeon1-4/+6
Refixed Old-style pdo connection string
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
Fixed rtrim issue in hostname fragment, for backward compability
2012-02-13Semicolon automatically added if not exists after hostname, if only database ↵Taufan Aditya1-2/+7
was not empty
2012-02-13Revert fix for #81 - it actually breaks thingsAndrey Andreev2-3/+2
2012-02-13Fix a changelog entryAndrey Andreev1-1/+1
2012-02-13Added DSN string supportAndrey Andreev2-2/+9
2012-02-12Fixed rtrim issue in hostname fragment, for backward compabilityTaufan Aditya1-5/+3
2012-02-12Merge pull request #757 from narfbg/2.1-stablePhil Sturgeon2-24/+83
Improve CI_Upload::_file_mime_type() realiability (2.1-stable)
2012-02-12Merge pull request #1026 from timw4mail/developPhil Sturgeon1-1/+5
Fixed old-style pdo connection string
2012-02-12Update the changelogAndrey Andreev1-0/+1
2012-02-12Merge remote-tracking branch 'upstream/develop' into develop-db-odbcAndrey Andreev13-188/+410
2012-02-12Fix issue #81Andrey Andreev1-3/+3
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 pull request #1022 from toopay/pdoPhil Sturgeon8-93/+294
Fixed PDO issues.
2012-02-10Grammar correctionTaufan Aditya1-1/+1