summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-04-03Merge pull request #868 from narfbg/develop-db-oci8Andrey Andreev6-148/+576
2012-04-03Update changelogSongpol Sripao-eiam1-0/+3
2012-04-02The current name is too wide change to get_content_type()consistent with set_...Songpol Sripaoeiam2-3/+3
2012-04-02Merge branch 'develop' of github.com:obiconbig/CodeIgniter into developSongpol Sripaoeiam1-1/+2
2012-04-02Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developSongpol Sripaoeiam8-7/+1484
2012-04-02Merge upstream branchAndrey Andreev28-107/+1917
2012-04-02Merge pull request #930 from narfbg/develop-db-sqlite3Andrey Andreev8-7/+1484
2012-04-02Merge upstream branchAndrey Andreev136-2304/+2251
2012-04-01Fix style codingSongpol Sripao-eiam1-1/+2
2012-04-01bracket on a new lineSongpol Sripaoeiam2-6/+7
2012-04-01add function get_current_content_type to output class and user manual librarySongpol Sripaoeiam2-0/+25
2012-03-30Merge pull request #1228 from toopay/database-testPhil Sturgeon13-19/+354
2012-03-30Configation based by environment constant, due Database test implementation a...Taufan Aditya1-33/+0
2012-03-30Multi database setupTaufan Aditya12-26/+265
2012-03-29Add a missing changelog entry for pull #1227Andrey Andreev1-0/+1
2012-03-29Merge pull request #1227 from ryanneufeld/developAndrey Andreev1-3/+3
2012-03-29Fix for Issue 88. _default_options does not exist in the Cache_memcahe driverRyan Neufeld1-3/+3
2012-03-29Merge pull request #1181 from matteomattei/developAndrey Andreev3-22/+42
2012-03-29Changed the dummy DB free_result() method to void (that's how it's implemente...Andrey Andreev1-11/+10
2012-03-29Minor improvements to PostgreSQL and SQLite result classesAndrey Andreev2-44/+20
2012-03-28Add schema folderTaufan Aditya1-0/+0
2012-03-28Merge remote-tracking branch 'upstream/develop' into unit-testsTaufan Aditya9-279/+156
2012-03-28Travis setup and minor cleanupTaufan Aditya7-33/+75
2012-03-28Preliminary Database TestTaufan Aditya6-4/+91
2012-03-28Revert CI_DB_driver::_reset_select() to a regular method instead of abstract....Andrey Andreev1-1/+3
2012-03-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-oci8Andrey Andreev8-94/+15
2012-03-28Add a dummy db_select() method to CI_DB_driver and remove it from drivers tha...Andrey Andreev8-94/+15
2012-03-28Add buffer string attach function to changelog.Matteo Mattei1-1/+2
2012-03-28Merge upstream branchAndrey Andreev114-2025/+1580
2012-03-28Merge pull request #971 from narfbg/develop-db-driverAndrey Andreev1-151/+114
2012-03-28A replace array_key_exists() with isset()Andrey Andreev1-4/+4
2012-03-28Some more unneeded brackets removedAndrey Andreev1-1/+1
2012-03-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driverAndrey Andreev113-1875/+1467
2012-03-28Some minor style changes in the XMLRPC classAndrey Andreev1-33/+24
2012-03-28Added random ordering support for MSSQL and SQLSRV drivers and removed an unu...Andrey Andreev3-25/+10
2012-03-28Merge pull request #1226 from toopay/unit-testsPhil Sturgeon32-217/+265
2012-03-28Remove debugging lineTaufan Aditya1-1/+0
2012-03-28Merge remote-tracking branch 'upstream/develop' into unit-testsTaufan Aditya2-1/+2
2012-03-28Remove include or require declaration from all helpers testTaufan Aditya15-58/+80
2012-03-28Implementation of Mock class, remove ugly reflection classTaufan Aditya1-32/+3
2012-03-28Implementation of Mock class, remove ugly reflection classTaufan Aditya2-18/+20
2012-03-28Fix a CI_Loader::_ci_load_class() bugAndrey Andreev2-1/+2
2012-03-28Adding core and libraries mock classesTaufan Aditya1-7/+1
2012-03-28Adding core and libraries mock classesTaufan Aditya15-37/+79
2012-03-28Adding autoloader and mocks directoryTaufan Aditya9-81/+99
2012-03-27Remove EOF newlines from MySQLi driver and result classesAndrey Andreev2-2/+2
2012-03-27Merge feature/mysqli_oop branchAndrey Andreev3-26/+29
2012-03-26Some style adjustments and fixed comments in the Loader classAndrey Andreev1-30/+29
2012-03-26Some style adjustments and fixed comments in Router and Output classesAndrey Andreev2-28/+24
2012-03-26Remove remaining access description lines from helpers + some style fixesAndrey Andreev6-79/+48