summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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 ↵trit1-2/+4
attachment - should make things easier for the user who uses a custom name
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
Updated trans_start() and trans_complete() so _trans_depth increments.
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, ↵a-krebs1-2/+2
since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
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 ↵Jacob Terry1-0/+5
correctly Fix for issue #159 and #163.
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 ↵Repox1-4/+5
better fit the needs between CI routing and asset files. This suggestion addresses issue #684
2011-11-21Merge pull request #687 from bluefuton/developGreg Aker1-0/+1
Added HTTP status code 422 (Unprocessable Entity) to set_status_header()
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
Typo in "Watermarking Preferences". Configuration parameter is "wm_paddiing".
2011-11-21Typo in "Watermarking Preferences". Configuration parameter is "wm_padding", ↵David Dotson1-1/+1
but it is listed as "padding".
2011-11-21Merge pull request #685 from Repox/developPhil Sturgeon1-0/+1
Added 'opera mobi' to user agents making it identified as 'Opera Mini'. ...
2011-11-21Added 'opera mobi' to user agents making it identified as 'Opera Mini'. ↵Repox1-0/+1
Fixes issue #683
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
Problem: auto_link() only works on URLs that are preceded by a new line, space, or open parentheses. As a result the URL in the string below would be missed. 'Google<br />http://www.google.com/' Solution: Add a word boundary to the list of features that can precede a URL. Credit to: @scaryuncledevin, issue #419
2011-11-16Migrations - Changed config migration_version to state it is used in ↵Eric Barnes2-25/+22
migration->current. Removed white space and coding standards.
2011-11-14Merge pull request #670 from zwilias/developDerek Jones1-14/+14
Use `#.` instead of simply `#` to activate github's auto-enumerator
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
Conflicts: user_guide/helpers/url_helper.html
2011-11-14Changelogging and setting release date.Pascal Kriete1-2/+3
2011-11-14Tweaking the xss filter for IE <comment> tags, parameter injection, and ↵Pascal Kriete1-50/+41
weird html5 attributes.
2011-11-14Removing stray docblocksPascal Kriete1-12/+0
2011-11-13Fixed conflicts.Phil Sturgeon6-165/+185
2011-11-13Changelog tweaking the Sphinx docs to match old HTML docs for 2.1 and ↵Phil Sturgeon1-22/+52
accurately describe what 3.0 has added so far.
2011-11-13More changelog tweaking.Phil Sturgeon1-0/+3
2011-11-13Added TLS and SSL support to Email library. Fixes issue #171Radu Potop1-1/+19
2011-11-13Resolved issue 65 - made action on form_open_multipart helper function call ↵Ben Edmunds1-1/+1
optional
2011-11-13Updated changelog.Phil Sturgeon1-9/+10
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Merge pull request #665 from syahzul/developPhil Sturgeon2-4/+4
Fixed invalid date time format in date_helper and xmlrpc library.
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3