summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-04-26Fixed conflicts.Phil Sturgeon61-3242/+930
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon2-3/+6
2012-04-26Merge pull request #1061 from jamierumbelow/developPhil Sturgeon16-286/+297
2012-04-26PDO patch and run the testTaufan Aditya1-1/+1
2012-04-26A couple more documentation updatesJamie Rumbelow2-2/+2
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow136-7246/+6020
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
2012-04-24Updating XSS cleaning to better handle base64 encoded attributes.Wes Baker1-6/+8
2012-04-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
2012-04-24Update system/helpers/file_helper.phpst21-1/+1
2012-04-24Update system/database/drivers/sqlsrv/sqlsrv_driver.phpst21-1/+1
2012-04-24Update system/libraries/Javascript.phpCosmin Atanasiu1-1/+1
2012-04-23Use tabs to separate class propertiesTimothy Warren14-55/+54
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren5-18/+19
2012-04-23Tweak to comments to conform to style guide.Sam Li1-1/+1
2012-04-23Added fix for issue: https://github.com/EllisLab/CodeIgniter/issues/1277Sam Li1-0/+3
2012-04-23Merge upstreamTimothy Warren1-3/+1
2012-04-23Corrected the migration_missing_down_method language stringRepox1-1/+1
2012-04-23Merge pull request #1271 from dixy/develop-microtimeAndrey Andreev2-11/+8
2012-04-23Fix issue #1265Andrey Andreev1-8/+8
2012-04-23Merge pull request #1272 from king724/developPhil Sturgeon1-0/+1
2012-04-21Use parameter 'get_as_float' of microtime()dixy2-11/+8
2012-04-20Start comment cleanup of librariesTimothy Warren14-90/+440
2012-04-19Fix syntax errorTimothy Warren1-1/+1
2012-04-19Additional formatting fixesTimothy Warren13-204/+243
2012-04-19Normalize comments in core filesTimothy Warren11-184/+217
2012-04-17Adding a package adds configuration folder to the end of the list.Korri1-2/+2
2012-04-15Added the ability to insert objects with insert_batch() in Active Reccord.Iban Eguia1-1/+2
2012-04-13Switch erroneously declared protected properties in Output class to publicAndrey Andreev1-7/+7
2012-04-12Adding in .ics MIME type for calendar invites.Kevin King1-0/+1
2012-04-12Changed default CI_DB_result::_data_seek() return value to FALSE and removed ...Andrey Andreev13-83/+9
2012-04-10Add back an unused argument to _delete() due to CI_DB_driver being abstractAndrey Andreev1-1/+1
2012-04-10Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-pos...Andrey Andreev2-2/+4
2012-04-09Merge upstream branchAndrey Andreev41-1678/+404
2012-04-09Add a parameter to SQLite3 and PDO _close() due to CI_DB_driver being abstractAndrey Andreev2-2/+4
2012-04-09Merge upstream branchAndrey Andreev41-1689/+403
2012-04-09DB Utility improvementsAndrey Andreev14-631/+101
2012-04-09Switched public driver methods in DB forge to protectedAndrey Andreev11-22/+22
2012-04-09Multiple DB Forge improvementsAndrey Andreev15-659/+108
2012-04-09Add back limit parameter to Interbase and PostgreSQL _delete() due to CI_DB_a...Andrey Andreev2-2/+4
2012-04-09Added a default _delete() method to CI_DB_active_recordAndrey Andreev11-251/+38
2012-04-09Fix AR delete() for MSSQL and SQLSRVAndrey Andreev2-16/+20
2012-04-09Fix AR delete() for OracleAndrey Andreev1-11/+6
2012-04-09Extend fix for #798 to work across all DB drivers instead of just mysqlAndrey Andreev6-51/+76
2012-04-06Some minor improvements to the PDO driverAndrey Andreev1-33/+26
2012-04-06Fix a CI_DB_pdo_driver::trans_commit() bugAndrey Andreev1-24/+5
2012-04-06Merge upstream branchAndrey Andreev96-3890/+4443
2012-04-06Update _delete() and _update() with removal of unsupported LIMIT and ORDER BYAndrey Andreev1-8/+4
2012-04-06Merge upstream branchAndrey Andreev27-1496/+707
2012-04-06Renamed _escape_identifiers() to escape_identifiers() and moved it to CI_DB_d...Andrey Andreev24-469/+70