summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-06-13Revert a preg_replace()Andrey Andreev1-1/+1
2012-06-13Switch strstr() argumentsAndrey Andreev1-1/+1
2012-06-13Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1Phil Sturgeon155-160/+165
2012-06-13Revert from() alias escaping fix - it was breaking more stuffAndrey Andreev2-6/+3
2012-06-13Updated downloads page in docs to increment versionsDerek Jones1-1/+2
2012-06-13Updating version number and release date for 2.1.1Derek Jones140-140/+140
2012-06-11Fixed conflictsPhil Sturgeon15-38/+207
2012-06-07Revert a changeAndrey Andreev1-1/+1
2012-06-07Fixed valid_ip() for PHP < 5.2Andrey Andreev1-22/+21
2012-06-07Documenting IPv6 changes and adding update notes.Pascal Kriete4-1/+94
2012-06-07Adding IPv6 support to the Input and Form_validation libraries.Pascal Kriete4-7/+136
2012-05-27Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon1-1/+1
2012-05-27Driver_Library had $lib_name set as static, and used non-staticPhil Sturgeon1-1/+1
2012-05-27Fix an erroneus method nameAndrey Andreev1-1/+1
2012-05-24Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon5-15/+18
2012-05-24Stop travis trying to run unit tests on 2.1-stable.Phil Sturgeon1-0/+4
2012-05-24Fix issue #1387Andrey Andreev3-14/+16
2012-05-24Merge pull request #1389 from jamiefdhurst/2.1-stablePhil Sturgeon2-1/+2
2012-05-24Updating change log relating to #1059.Jamie Hurst1-0/+1
2012-05-24Adding width and height to list of clear variables to fix #1059Jamie Hurst1-1/+1
2012-05-23Removed the starting slash from uri_string() documentation.Phil Sturgeon1-1/+1
2012-05-23Added ability to _like paramater side to use 'none', in case one wants to que...Nithin1-2/+6
2012-05-20Merge pull request #1331 from rogeriopradoj/patch-1Phil Sturgeon3-3/+25
2012-05-19Fix a issue with CI_DB_pdo_result::num_rows()Rogerio Prado de Jesus2-1/+13
2012-05-19Fix a issue with affect_rows in CI_DB_pdo_driver::_execute()Rogerio Prado de Jesus2-2/+12
2012-05-19Fix issue #726Andrey Andreev2-8/+9
2012-05-17Merge branch 'release/2.1.1'Phil Sturgeon163-359/+560
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon155-299/+391
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev2-1/+2
2012-05-17Use tabs for indentingAlexander Hofstede1-1/+1
2012-05-17Revert "Use tab for indent"Alexander Hofstede3-16/+1
2012-05-17Use tab for indentAlexander Hofstede3-1/+16
2012-05-17Check cookie against md5 regex.Alexander Hofstede2-1/+2
2012-05-07Added a return false if an image doesn't pass XSS cleaning to prevent file_ge...Wes Baker1-0/+4
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-03-04Merge pull request #1116 from tubalmartin/helpers|url|2.1-stablePhil Sturgeon3-23/+24
2012-03-04Changelog updatedtubalmartin1-1/+1
2012-03-04User guide updatedtubalmartin1-3/+3
2012-03-04Allow developers to use any string as a separator, not just dashes or undersc...tubalmartin1-10/+19
2012-03-04Merge pull request #1117 from tubalmartin/Upload|library|2.1-stablePhil Sturgeon1-1/+1
2012-03-04Removed changelog entrytubalmartin1-1/+0
2012-03-03Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is used...tubalmartin2-1/+2
2012-03-03An even better url_title helper. Tests: http://codepad.org/tuJgvkyNtubalmartin2-20/+12
2012-03-02Merge pull request #1100 from rrdial/2.1-stableAndrey Andreev2-6/+7
2012-03-01compile binds before caching the query, otherwise the cached query will never...Ryan Dial2-6/+7
2012-02-12Merge pull request #757 from narfbg/2.1-stablePhil Sturgeon2-24/+83
2011-12-26Merge pull request #709 from tubalmartin/2.1-stablePhil Sturgeon1-0/+14
2011-12-15Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stableAndrey Andreev2-1/+2
2011-12-14Merge pull request #766 from andrewmackrodt/2.1-stablePhil Sturgeon2-1/+2