summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2011-10-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-149/+118
2011-10-23Fixed an issue with the Image_lib class not clearing width, height or create_...Seb Pollard1-1/+4
2011-10-22Merge pull request #553 from narfbg/ci-oci8-driver-php5Phil Sturgeon3-149/+118
2011-10-21Minor format fixTimothy Warren1-2/+0
2011-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren126-474/+2151
2011-10-21Fix mysql charset bugTimothy Warren1-4/+22
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones127-473/+2154
2011-10-20get_magic_quotes_gpc() to be executed only if PHP version is 5.3 or lowerAndrey Andreev2-5/+13
2011-10-20Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-20Merge remote-tracking branch 'upstream/develop' into ci-oci8-driver-php5Andrey Andreev11-84/+308
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19Update system/libraries/Email.phpdiegorivera1-1/+9
2011-10-19Merge pull request #594 from ktomk/patch-8Derek Jones1-0/+5
2011-10-18Merge pull request #307 from kylefarris/isue-276Derek Jones1-58/+253
2011-10-17Check for string value before doing str_replace. (Issue #439)Chris Muench1-1/+4
2011-10-16Fixes issue #439 some slashes not escaped in session dataChris Muench1-16/+29
2011-10-15Merge pull request #579 from appleboy/bug/cacheGreg Aker1-2/+2
2011-10-15Fix #576: using ini_get() to detect if apc is enabled or notBo-Yi Wu1-2/+2
2011-10-14Merged with developmentKyle Farris43-298/+1778
2011-10-13Update: fix typo error #564Bo-Yi Wu1-1/+1
2011-10-10Converted database constructors to PHP5 typeTimothy Warren5-6/+6
2011-10-07Remove another 2 old commentsAndrey Andreev1-2/+0
2011-10-07Cleanup and migrate oci8_driver and oci8_result from deprecated PHP4 to PHP5 ...Andrey Andreev2-115/+86
2011-10-07CI_Loader::driver() processes empty library. Fixed.Tom Klingenberg1-0/+5
2011-10-07if statment code style updateTimothy Warren1-6/+6
2011-10-07Added check for quote markTimothy Warren1-2/+5
2011-10-07Revert "Added check for quote mark"Timothy Warren1-5/+21
2011-10-07Revert "Changed all db constructors to newer syntax, made insert_id() functio...Timothy Warren5-6/+6
2011-10-07Added check for quote markTimothy Warren1-21/+5
2011-10-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren4-10/+14
2011-10-06Merge pull request #483 from markhuot/developGreg Aker1-1/+10
2011-10-06Merge pull request #497 from cenk/uaGreg Aker1-2/+2
2011-10-06Merge pull request #511 from freewil/typography-helper-dryGreg Aker1-6/+1
2011-10-06Merge pull request #530 from MrHyde/developGreg Aker1-1/+1
2011-10-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-2/+64
2011-10-06Changed all db constructors to newer syntax, made insert_id() function more c...Timothy Warren6-7/+25
2011-10-05Changed to escape using PDO::quote()Timothy Warren1-11/+4
2011-10-05Merge pull request #486 from narfbg/ci-issue-60Phil Sturgeon1-2/+64
2011-10-05Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-50/+19
2011-10-05Fix location file Security Class to core folderpurwandi1-1/+1
2011-10-05newline character ending for link_tag() function resultMrHyde1-1/+1
2011-10-04Merge pull request #528 from narfbg/ci-core-securityDerek Jones1-50/+19
2011-10-04Added batch functions, fixed excaping functionTimothy Warren1-3/+90
2011-10-04Clean up core Security classAndrey Andreev1-50/+19
2011-10-04Merge pull request #282 from timw4mail/developPhil Sturgeon6-1/+1242
2011-10-04Change Windows OS detection approachAndrey Andreev1-1/+1
2011-10-04Merge branch 'ci-issue-60' of github.com:narfbg/CodeIgniter into ci-issue-60Andrey Andreev1-1/+1
2011-10-04Merge upstream changesAndrey Andreev12-65/+53
2011-10-04Merge pull request #513 from freewil/core-cleanupPhil Sturgeon1-20/+0