summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow231-7887/+10538
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren4-32/+38
2012-04-26Merge pull request #1292 from ChadBH/developAndrey Andreev1-2/+2
2012-04-26Corrected path to jqueryChad Hedgcock1-2/+2
2012-04-25Merge pull request #1288 from petsagouris/Issue-131Andrey Andreev2-29/+35
2012-04-25Added foreign_characters.php changes in the changelog.George Petsagourakis1-0/+1
2012-04-25Merge pull request #1289 from st2/patch-2Andrey Andreev1-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 Warren2-2/+2
2012-04-24Update system/helpers/file_helper.phpst21-1/+1
2012-04-24Add changelog entry for already fixed issue #23Andrey Andreev1-1/+1
2012-04-24Added Romanian characters to the foreign_chars.phpGeorge Petsagourakis1-4/+4
2012-04-24Added Greek characters to the foreign_chars.phpGeorge Petsagourakis1-28/+33
2012-04-24Merge pull request #1286 from st2/patch-1Phil Sturgeon1-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 Warren6-18/+20
2012-04-23Merge pull request #1278 from samxli/developPhil Sturgeon1-0/+3
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-23Merge pull request #1274 from Repox/2.1-stablePhil Sturgeon1-1/+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 Andreev2-8/+9
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-20added suggested styleguide addition for future consistencyTimothy Warren1-1/+12
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-18Merge pull request #1260 from Razican/db_acPhil Sturgeon2-1/+3
2012-04-18Merge pull request #1263 from timw4mail/patchPhil Sturgeon1-1/+2
2012-04-17minor style fixTimothy Warren1-2/+2
2012-04-17Updated supported database driver listTimothy Warren1-1/+2
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 Eguia2-1/+3
2012-04-13Switch erroneously declared protected properties in Output class to publicAndrey Andreev1-7/+7
2012-04-13Merge pull request #1256 from rogeriopradoj/patch-1Andrey Andreev1-1/+1
2012-04-13Update Release Date for version 2.1.1 at user_guide_src/source/changelog.rst Rogerio Prado de Jesus1-1/+1
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-09Fix changelog merge conflictAndrey Andreev1-4/+0
2012-04-09Merge upstream branchAndrey Andreev42-1681/+417
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 Andreev42-1692/+413