summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-11-27Merge pull request #628 from kridolfo/patch-1Eric Barnes1-0/+3
2011-11-27Added unit test to confirm pull request #675Eric Barnes1-0/+15
2011-11-27Merge branch 'refs/heads/develop' into feature/unit-testsEric Barnes3-6/+6
2011-11-27Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into has2k1-p...Eric Barnes2-5/+5
2011-11-27Updated docs for increment_string example.Eric Barnes1-1/+1
2011-11-27Added prep_url and auto_link testsEric Barnes1-0/+23
2011-11-27Added tests for removing extra dashes in url title.Eric Barnes1-2/+14
2011-11-27Fixed accept lang test to account for boolean results.Eric Barnes1-12/+12
2011-11-27Added tests for new increment_stringEric Barnes1-27/+38
2011-11-27Merge branch 'refs/heads/develop' into feature/unit-testsEric Barnes473-29204/+29540
2011-11-24Merge pull request #704 from bitrayne/developPhil Sturgeon3-7/+13
2011-11-24Updating the user agent after being corrected on commit b8daad7Repox1-1/+1
2011-11-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRepox2-0/+6
2011-11-23Reworded new attach() section in email user guidetrit1-1/+1
2011-11-23Added an entry for the new Email::attach parameterstrit1-1/+5
2011-11-23Switch disposition set to ternary operationtrit1-6/+1
2011-11-23More style tweakstrit1-0/+3
2011-11-23Changed attachment definition to allow for blank disposition defaulting to at...trit1-2/+4
2011-11-23Added a couple of style tweaks and a note about function change in changelogtrit2-8/+4
2011-11-23Added space after CI_Email for coding standardtrit1-1/+1
2011-11-23Switched order of arguments to maintain compatibilitytrit1-1/+1
2011-11-23Changed the names around againtrit1-2/+2
2011-11-23Changed filepath back to filenametrit1-7/+7
2011-11-23Fixed variable name causing problemtrit1-1/+1
2011-11-23Added custom file name to attach(), updated _build_message to handle ittrit1-10/+16
2011-11-23Merge pull request #691 from jerkob/developPhil Sturgeon2-0/+6
2011-11-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRepox9-45/+57
2011-11-23fix to issue #696 - make oci_execute calls inside num_rows non-committing, si...a-krebs1-2/+2
2011-11-22Updated changelog with _trans_depth fix.Jacob Terry1-0/+1
2011-11-22Updated trans_start() and trans_complete() so that _trans_depth increments co...Jacob Terry1-0/+5
2011-11-22Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-1/+3
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon9-45/+57
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-22Altered the explenation of the rewrite rules to better fit the actual result.Repox1-1/+1
2011-11-22Altered the suggested mod_rewrite rules for removing index.php from URL to be...Repox1-4/+5
2011-11-21Merge pull request #687 from bluefuton/developGreg Aker1-0/+1
2011-11-21Added HTTP status code 422 (Unprocessable Entity) to set_status_header()Chris Rosser1-0/+1
2011-11-21Merge pull request #686 from SneakyDave/developPhil Sturgeon1-1/+1
2011-11-21Typo in "Watermarking Preferences". Configuration parameter is "wm_padding", ...David Dotson1-1/+1
2011-11-21Merge pull request #685 from Repox/developPhil Sturgeon1-0/+1
2011-11-21Added 'opera mobi' to user agents making it identified as 'Opera Mini'. Fixes...Repox1-0/+1
2011-11-21Updated syntax in changewlog.Phil Sturgeon1-1/+1
2011-11-20Update user_guide_src/source/changelog.rsthas2k11-0/+1
2011-11-17auto_link() learned to recognize more URLs has2k11-1/+1
2011-11-16Migrations - Changed config migration_version to state it is used in migratio...Eric Barnes2-25/+22
2011-11-14Merge pull request #670 from zwilias/developDerek Jones1-14/+14
2011-11-14Use `#.` instead of simply `#` to activate github's auto-enumeratorIlias Van Peer1-14/+14
2011-11-14Merge branch 'release/2.1.0'Pascal Kriete202-731/+5366
2011-11-14Changelogging and setting release date.Pascal Kriete1-2/+3
2011-11-14Tweaking the xss filter for IE <comment> tags, parameter injection, and weird...Pascal Kriete1-50/+41