summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-05-24Update vfsStream reference, run the testTaufan Aditya1-3/+3
2012-05-24Fix issue #1273 and some cleanup in Query BuilderAndrey Andreev2-28/+22
2012-05-24Add backwards compatibility work-around for the configuration settingAndrey Andreev1-0/+7
2012-05-24Remove the DB destructor (db->close())Andrey Andreev2-18/+1
2012-05-24Fix issue #1388Andrey Andreev1-2/+2
2012-05-23Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon10-15/+10
2012-05-23Input, Session and Cookie get's will return NULL.Phil Sturgeon6-35/+30
Read more about this change here: http://codeigniter.com/forums/viewthread/215833
2012-05-23Merge pull request #1320 from thallisphp/patch-2Phil Sturgeon1-1/+1
Update system/libraries/Cart.php - To enable integrity when using associative arrays
2012-05-23Merge pull request #1367 from PawelDecowski/developPhil Sturgeon1-11/+0
Remove set_time_limit() call. Fixes #1346
2012-05-23Merge pull request #1357 from timw4mail/errorsPhil Sturgeon8-3/+9
Move errors to views folder
2012-05-23Merge pull request #1365 from sourcejedi/e_strictPhil Sturgeon1-10/+0
If we want E_STRICT, don't suppress it.
2012-05-23Merge pull request #1379 from brentashley/developPhil Sturgeon1-1/+8
Add step to move existing core extensions to new folder
2012-05-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren16-99/+87
2012-05-23Fix a typo in the changelogAndrey Andreev1-1/+1
2012-05-23Removed the parameter use in database drivers' _close() and added a default ↵Andrey Andreev15-90/+71
_close() method in CI_DB_driver + some changelog fixes
2012-05-22Merge pull request #1378 from gintsmurans/developAndrey Andreev2-10/+17
Move closing of database connection to CI_DB_driver->__destruct - #1376
2012-05-22Removed a space after comment lineGints Murans1-1/+1
2012-05-22Moved destruct to the end of fileGints Murans1-7/+17
2012-05-22fix typo in step 8Brent Ashley1-1/+1
2012-05-22Add step to move existing core extensions to new folderBrent Ashley1-1/+8
2012-05-22Move closing of database connection to CI_DB_driver->__destruct - #1376Root2-10/+7
2012-05-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren5-4/+40
2012-05-21Merge pull request #1372 from juanitomint/developAndrey Andreev3-0/+34
Added unbuffered_row() function (issue #1351)
2012-05-21added a comment for unbuffered_rowJuan Ignacio Borda1-0/+1
2012-05-19Fixed typoJuan Ignacio Borda1-1/+1
2012-05-19Fixed some spacesJuan Ignacio Borda1-1/+1
2012-05-19Fixed return line and commentsJuan Ignacio Borda1-8/+3
2012-05-19Add missing changelog entries from 2.1-stableAndrey Andreev1-1/+3
2012-05-18Added doc notes for unbuffered_row() functionJuan Ignacio Borda1-0/+20
2012-05-18added unbuffered_row() to DB_result.php to avoid memory exhausting when ↵Juan Ignacio Borda1-0/+18
dealing with large results.
2012-05-17Changed the default controller route to use single quotes instead of double ↵Alex Bilbie1-1/+1
quotes
2012-05-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon92-1184/+2362
2012-05-17Fixed conflicts from merging in 2.1.1.Phil Sturgeon1-1/+1
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon155-299/+391
2012-05-17Remove set_time_limit() call. CodeIgniter should respect php.ini setting.Pawel Decowski1-11/+0
2012-05-17Added changelog entryTimothy Warren1-0/+1
2012-05-17merge upstreamTimothy Warren57-1106/+1057
2012-05-17Merge pull request #1300 from timw4mail/patchAndrey Andreev12-516/+499
Fix rest of the helpers
2012-05-17Add parens to changelog entryTimothy Warren1-1/+1
2012-05-17Suggested changesTimothy Warren2-2/+2
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren2-5/+6
2012-05-17Merge upstreamTimothy Warren82-669/+1864
2012-05-17Clean up the helpersAndrey Andreev6-43/+39
2012-05-17Clean up the librariesAndrey Andreev24-414/+383
2012-05-17Cleanup the core classesAndrey Andreev15-132/+135
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev2-1/+2
Check cookie against md5 regex. 2.1 stable CSRF injection security fix
2012-05-17Use tabs for indentingAlexander Hofstede1-1/+1
2012-05-17Revert "Use tab for indent"Alexander Hofstede3-16/+1
This reverts commit c3eb672ed01c57a543dd8cdf1b90eb4001498c19.
2012-05-17Use tab for indentAlexander Hofstede3-1/+16
2012-05-17Check cookie against md5 regex.Alexander Hofstede2-1/+2
Otherwise, cookie can contain arbitrary injected code that gets sent back directly to the browser.