summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-04Fixed conflicts.Phil Sturgeon1-3/+2
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon38-913/+1976
2012-03-04Merged conflicts.Phil Sturgeon3-8/+9
2012-03-04Merge pull request #1117 from tubalmartin/Upload|library|2.1-stablePhil Sturgeon1-1/+1
2012-03-04Removed changelog entrytubalmartin1-1/+0
2012-03-03Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is used...tubalmartin2-1/+2
2012-03-03An even better url_title helper. Tests: http://codepad.org/tuJgvkyNtubalmartin2-20/+12
2012-03-03Fix MySQL/MySQLi field_data()Andrey Andreev2-12/+50
2012-03-03Merge pull request #1108 from Brenderous/patch-1Andrey Andreev1-1/+1
2012-03-03Just a grammar fix. Changed "...as the code these file contain will be minimi...Brenderous1-1/+1
2012-03-03Merge upstream branchAndrey Andreev25-373/+1584
2012-03-03Replace usage of legacy alias pg_exec() in favor of pg_query() and improve Po...Andrey Andreev1-28/+10
2012-03-03Added _optimize_table() support for PostgreSQLAndrey Andreev3-26/+17
2012-03-03Add db_set_charset() support for PostgreSQL and change its implementation for...Andrey Andreev3-1/+15
2012-03-03Improve DB version() implementation and add pg_version() supportAndrey Andreev14-87/+111
2012-03-03Updated tabs, reinserted license, and fixed logic on get()Mike Davies1-25/+37
2012-03-02Merge pull request #1107 from diogoosorio/developAndrey Andreev2-2/+6
2012-03-02Made the code more readable, updated the changelog.Diogo Osório2-1/+2
2012-03-02Merge pull request #1106 from timw4mail/developPhil Sturgeon2-1/+2
2012-03-02Updated changelogTimothy Warren1-0/+1
2012-03-02Removed db_set_charset() from Interbase driver (no longer needed)Andrey Andreev1-15/+0
2012-03-02#1080 - Check if the SMTP connection and authentication were successfull.Diogo Osório1-2/+5
2012-03-02Removed welcome_message view changesTimothy Warren1-2/+0
2012-03-02Limit db session select to single rowTimothy Warren1-1/+1
2012-03-02Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-29/+19
2012-03-02Replace Interbase _error_message(), _error_number() with the new error() methodAndrey Andreev1-29/+19
2012-03-02Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren38-937/+2130
2012-03-02Merge pull request #1067 from timw4mail/firebirdPhil Sturgeon9-5/+1319
2012-03-02Merge upstreamTimothy Warren21-317/+223
2012-03-02Replaced DB methods _error_message() and _error_number() with error() (issue ...Andrey Andreev13-205/+122
2012-03-02Added method visibility declarations to SQLite DB utility classAndrey Andreev1-26/+15
2012-03-02Merge upstream branchAndrey Andreev6-69/+58
2012-03-02Fix a bug in Oracle's DB forge _create_table() method (AUTO_INCREMENT is not ...Andrey Andreev2-47/+18
2012-03-02Fix issue #1101 (MySQL/MySQLi result field_data())Andrey Andreev3-22/+16
2012-03-02Merge pull request #1103 from IT-Can/error-array-565Andrey Andreev3-0/+24
2012-03-02updated error_array #565Michiel Vugteveen3-0/+24
2012-03-02Merge upstream branchAndrey Andreev2-7/+6
2012-03-02Fix issue #803 (Profiler library didn't handle objects properly)Andrey Andreev2-7/+6
2012-03-02Merge pull request #1100 from rrdial/2.1-stableAndrey Andreev2-6/+7
2012-03-01compile binds before caching the query, otherwise the cached query will never...Ryan Dial2-6/+7
2012-03-01Merge upstream branchAndrey Andreev3-26/+38
2012-03-01Remove a PHP_VERSION < 5 check (no longer needed)Andrey Andreev1-16/+6
2012-03-01Fix issue #413 (Oracle _error_message(), _error_number())Andrey Andreev2-10/+32
2012-03-01Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren10-167/+24
2012-03-01Merge upstream branchAndrey Andreev16-476/+290
2012-03-01Merge pull request #1083 from narfbg/develop-db-set-charsetAndrey Andreev10-139/+9
2012-03-01Merge upstream changesAndrey Andreev14-414/+494
2012-03-01Fixed a bug in CUBRID's affected_rows()Andrey Andreev2-5/+5
2012-03-01Fix a bug in PDO's insert_id() (PostgreSQL-specific)Andrey Andreev2-23/+10
2012-03-01Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren8-143/+154