summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-12-25Merge branch 'develop' into feature/unit-testsGreg Aker44-929/+884
2011-12-25Merge branch 'patch-4' of https://github.com/kylefarris/CodeIgniter into ↵Greg Aker2-1/+3
kylefarris-patch-4 Conflicts: user_guide_src/source/changelog.rst
2011-12-25Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker1-15/+9
2011-12-25Fixing soft tabs in a few files.Greg Aker11-62/+58
2011-12-25Merge pull request #819 from narfbg/develop-migrationGreg Aker1-15/+9
Improve the Migration library
2011-12-25Updating changelog & adding a migrations documentation file so those docs ↵Greg Aker2-7/+15
can be started on.
2011-12-25Merge pull request #792 from a-krebs/patch-1Greg Aker1-2/+2
fix to issue #696
2011-12-25Merge pull request #809 from pporlan/patch-1Greg Aker1-3/+7
Adding $escape parameter to the order_by function, this enables ordering...
2011-12-25Merge pull request #814 from narfbg/develop-calendarGreg Aker1-79/+68
Improve the Calendar library
2011-12-25Merge pull request #816 from mrw/patch-1Greg Aker1-1/+1
Changes "ie" to "e.g."
2011-12-24Improve the Migration libraryAndrey Andreev1-15/+9
2011-12-24Some braces & spaces added/removed to comply with the coding standartsAndrey Andreev1-10/+24
2011-12-24Changes "ie" to "e.g." mrw1-1/+1
The instruction is followed by an example database type, not a clarification of what database types in general are, so it should use "e.g."
2011-12-24Merge pull request #815 from narfbg/develop-parserEric Barnes1-20/+20
Improve the Parser library
2011-12-24Improve the Parser libraryAndrey Andreev1-20/+20
2011-12-24Improve the Calendar libraryAndrey Andreev1-79/+54
2011-12-23Merge pull request #813 from narfbg/develop-logEric Barnes1-11/+9
Clean up the Log library
2011-12-23Merge pull request #796 from narfbg/developEric Barnes3-117/+99
Optimize display_errors() in Image_lib, Trackback and Upload libraries
2011-12-22Merge pull request #811 from narfbg/develop-emailPhil Sturgeon1-307/+171
Improve the Email library
2011-12-22Merge pull request #812 from narfbg/develop-ftpPhil Sturgeon1-60/+42
Improve the FTP library
2011-12-22Clean up the Log libraryAndrey Andreev1-11/+9
2011-12-22Improve the FTP libraryAndrey Andreev1-60/+42
2011-12-22Update with suggestions from philsturgeonAndrey Andreev1-5/+5
2011-12-22Merge pull request #810 from narfbg/develop-driverEric Barnes1-7/+8
Clean up the Driver library
2011-12-22Merge pull request #807 from narfbg/develop-cartPhil Sturgeon2-136/+64
Improve the Cart library.
2011-12-22Improve the Email libraryAndrey Andreev1-308/+172
2011-12-22Clean up the Driver libraryAndrey Andreev1-7/+8
2011-12-22Cast to float instead of using preg_replace() for sanitizing numbersAndrey Andreev1-4/+5
2011-12-22Adding $escape parameter to the order_by function, this enables ordering by ↵pporlan1-3/+7
custom fields
2011-12-21Improved the Cart libraryAndrey Andreev2-135/+62
2011-12-21Also replace old-style 'var' with 'public'Andrey Andreev3-53/+53
2011-12-20Merge remote-tracking branch 'upstream/develop' into developAndrey Andreev4-37/+49
2011-12-20Merge pull request #801 from Mancy/masterPhil Sturgeon3-2/+13
Fixed issue #798: Update with Like now works
2011-12-20#798: update changelog and typo fixMancy2-1/+2
2011-12-20#798: following current codeigniter code standardsMancy1-5/+6
2011-12-20taking care of LIKE when used in UPDATE statement #798Mancy2-2/+11
2011-12-19Fixed year and month seconds for timespan().Eric Barnes2-35/+36
2011-12-19Add method visibility declarations and optimize display_errors() method in ↵Andrey Andreev3-64/+46
Image_lib, Trackback and Upload libraries
2011-12-19Added #795 to changelogEric Barnes1-1/+1
2011-12-19Merge pull request #795 from Eclarian/form-open-attr-bugEric Barnes1-1/+1
Make form open properly when empty array of parameters is passed
2011-12-19Makes form open properly when empty array of parameters is passedJoel Kallman1-1/+1
Signed-off-by: Joel Kallman <jkallman@eclarian.com>
2011-12-15Merge pull request #752 from toopay/pdo_sqliteEric Barnes1-1/+4
Fix for PDO driver, exception for sqlite in DSN spec
2011-12-14Added a reference note for people needing to limit to a set number of charactersEric Barnes1-0/+5
2011-12-14Merge pull request #775 from andrew-s/developPhil Sturgeon3-8/+67
Multiple improvements to Cart.php
2011-12-14Slight syntax change to the Cart classAndrew Seymour1-1/+3
2011-12-14Added in a remove item from cart function to save the "hacky" method of ↵Andrew Seymour3-3/+32
updating a product with 0 quantity, updated the changelog to reflect and to be neater and more readable surrounding the changes of the Cart library
2011-12-13Changed the syntax slightly, @philsturgeon may be claustrophobic as he ↵Andrew Seymour1-1/+1
doesn't like no spaces
2011-12-13Added the ability to get the contents in a different orderAndrew Seymour2-4/+15
2011-12-13Spacing added, @philsturgeon is too picky!Andrew Seymour1-1/+1
2011-12-13Merged the two if's together as suggested by @philsturgeon - updated the ↵Andrew Seymour2-6/+4
Changelog to include something that may be important