summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-01Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sql...Andrey Andreev16-475/+289
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
2012-03-01Fix PDO's _version() method where it used to return client version instead of...Andrey Andreev2-4/+4
2012-03-01Fix issue #1036 (is_write_type() returned FALSE for RENAME, OPTIMIZE queries)Andrey Andreev2-9/+5
2012-03-01Fix issue #611 (SQLSRV _error_message() and _error_number() warnings)Andrey Andreev2-10/+28
2012-03-01Fix issue #153 (E_NOTICE generated by getimagesize())Andrey Andreev2-9/+8
2012-03-01Fix issue #129 (ODBC num_rows() returning -1 in some cases)Andrey Andreev2-4/+17
2012-03-01Fix issue #81 (ODBC list_fields(), field_data())Andrey Andreev2-20/+20
2012-03-01Fix an Oracle escape_str() bug (#68, #414)Andrey Andreev2-8/+7
2012-03-01Some other minor improvements to the Email libraryAndrey Andreev1-81/+67
2012-03-01Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren4-124/+67
2012-03-01Switch ANDs to &&, || to OR in the Email classAndrey Andreev1-14/+13
2012-03-01Remove access lines and fix method description blocks in the Email classAndrey Andreev1-84/+25
2012-03-01Switch private properties in the Email class to protectedAndrey Andreev1-24/+25
2012-03-01Fix 'skip' section of limit clauseTimothy Warren1-1/+1
2012-02-29Change end() usage due to E_STRICT messagesAndrey Andreev2-2/+4
2012-02-29Finally figured out limit statementTimothy Warren1-1/+25
2012-02-29Add strtolower to the HTTPS checkAndrey Andreev1-1/+1
2012-02-29Merge pull request #1093 from IT-Can/upload-double-slash-fixAndrey Andreev1-1/+1
2012-02-29removed changelogMichiel Vugteveen1-1/+0
2012-02-29removed double slashMichiel Vugteveen2-1/+2
2012-02-29Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren7-123/+263
2012-02-29Merge pull request #1088 from IT-Can/word-mime-fixAndrey Andreev2-1/+2
2012-02-29changelog fixMichiel Vugteveen1-1/+1
2012-02-29updated branchMichiel Vugteveen8-151/+277
2012-02-29docx and xlsx was already fixesMichiel Vugteveen2-2/+3
2012-02-29Merge pull request #1092 from narfbg/develop-force-downloadAndrey Andreev2-41/+43
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite3Andrey Andreev6-83/+220
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-issue-499Andrey Andreev6-84/+221
2012-02-29Merge upstream branchAndrey Andreev6-85/+221
2012-02-29Improved plural() and singular().Phil Sturgeon2-56/+98
2012-02-29Add an optional set_mime parameter to force_download()Andrey Andreev2-39/+42
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon5-28/+123
2012-02-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren2-28/+15
2012-02-28Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite3Andrey Andreev3-46/+28
2012-02-28Merge upstream branchAndrey Andreev3-46/+28
2012-02-28Merge upstream branchAndrey Andreev2-28/+15
2012-02-28Merge pull request #1089 from narfbg/develop-issue-177Andrey Andreev2-28/+15
2012-02-28Replace AND with &&Andrey Andreev1-1/+1
2012-02-28Fix issue #177Andrey Andreev2-28/+15
2012-02-28mime types doc, docx, xlsx fixesMichiel Vugteveen1-3/+3
2012-02-27Add changelog entryAndrey Andreev1-0/+1
2012-02-27Do not create a CSRF cookie if CSRF protection is not enabledAndrey Andreev1-19/+20
2012-02-27Merge upstreamTimothy Warren7-32/+80