Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2011-11-27 | Merge pull request #628 from kridolfo/patch-1 | Eric Barnes | 1 | -0/+3 | |
Added links to the user guide for Encryption class and Session class. | |||||
2011-11-27 | Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into ↵ | Eric Barnes | 2 | -5/+5 | |
has2k1-patch-1 Conflicts: user_guide_src/source/changelog.rst | |||||
2011-11-27 | Updated docs for increment_string example. | Eric Barnes | 1 | -1/+1 | |
2011-11-24 | Merge pull request #704 from bitrayne/develop | Phil Sturgeon | 3 | -7/+13 | |
Allow a custom file name for email attachments. | |||||
2011-11-24 | Updating the user agent after being corrected on commit b8daad7 | Repox | 1 | -1/+1 | |
Relates to issue #683. | |||||
2011-11-24 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Repox | 2 | -0/+6 | |
2011-11-23 | Reworded new attach() section in email user guide | trit | 1 | -1/+1 | |
2011-11-23 | Added an entry for the new Email::attach parameters | trit | 1 | -1/+5 | |
2011-11-23 | Switch disposition set to ternary operation | trit | 1 | -6/+1 | |
2011-11-23 | More style tweaks | trit | 1 | -0/+3 | |
2011-11-23 | Changed attachment definition to allow for blank disposition defaulting to ↵ | trit | 1 | -2/+4 | |
attachment - should make things easier for the user who uses a custom name | |||||
2011-11-23 | Added a couple of style tweaks and a note about function change in changelog | trit | 2 | -8/+4 | |
2011-11-23 | Added space after CI_Email for coding standard | trit | 1 | -1/+1 | |
2011-11-23 | Switched order of arguments to maintain compatibility | trit | 1 | -1/+1 | |
2011-11-23 | Changed the names around again | trit | 1 | -2/+2 | |
2011-11-23 | Changed filepath back to filename | trit | 1 | -7/+7 | |
2011-11-23 | Fixed variable name causing problem | trit | 1 | -1/+1 | |
2011-11-23 | Added custom file name to attach(), updated _build_message to handle it | trit | 1 | -10/+16 | |
2011-11-23 | Merge pull request #691 from jerkob/develop | Phil Sturgeon | 2 | -0/+6 | |
Updated trans_start() and trans_complete() so _trans_depth increments. | |||||
2011-11-23 | Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop | Repox | 9 | -45/+57 | |
2011-11-23 | fix to issue #696 - make oci_execute calls inside num_rows non-committing, ↵ | a-krebs | 1 | -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-22 | Updated changelog with _trans_depth fix. | Jacob Terry | 1 | -0/+1 | |
2011-11-22 | Updated trans_start() and trans_complete() so that _trans_depth increments ↵ | Jacob Terry | 1 | -0/+5 | |
correctly Fix for issue #159 and #163. | |||||
2011-11-22 | Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop | Phil Sturgeon | 3 | -1/+3 | |
2011-11-22 | Merge master (2.1.0) and fixed conflicts. | Phil Sturgeon | 9 | -45/+57 | |
2011-11-22 | Readded PDO drivers. | Phil Sturgeon | 5 | -15/+565 | |
2011-11-22 | Altered the explenation of the rewrite rules to better fit the actual result. | Repox | 1 | -1/+1 | |
2011-11-22 | Altered the suggested mod_rewrite rules for removing index.php from URL to ↵ | Repox | 1 | -4/+5 | |
better fit the needs between CI routing and asset files. This suggestion addresses issue #684 | |||||
2011-11-21 | Merge pull request #687 from bluefuton/develop | Greg Aker | 1 | -0/+1 | |
Added HTTP status code 422 (Unprocessable Entity) to set_status_header() | |||||
2011-11-21 | Added HTTP status code 422 (Unprocessable Entity) to set_status_header() | Chris Rosser | 1 | -0/+1 | |
2011-11-21 | Merge pull request #686 from SneakyDave/develop | Phil Sturgeon | 1 | -1/+1 | |
Typo in "Watermarking Preferences". Configuration parameter is "wm_paddiing". | |||||
2011-11-21 | Typo in "Watermarking Preferences". Configuration parameter is "wm_padding", ↵ | David Dotson | 1 | -1/+1 | |
but it is listed as "padding". | |||||
2011-11-21 | Merge pull request #685 from Repox/develop | Phil Sturgeon | 1 | -0/+1 | |
Added 'opera mobi' to user agents making it identified as 'Opera Mini'. ... | |||||
2011-11-21 | Added 'opera mobi' to user agents making it identified as 'Opera Mini'. ↵ | Repox | 1 | -0/+1 | |
Fixes issue #683 | |||||
2011-11-21 | Updated syntax in changewlog. | Phil Sturgeon | 1 | -1/+1 | |
2011-11-20 | Update user_guide_src/source/changelog.rst | has2k1 | 1 | -0/+1 | |
2011-11-17 | auto_link() learned to recognize more URLs | has2k1 | 1 | -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-16 | Migrations - Changed config migration_version to state it is used in ↵ | Eric Barnes | 2 | -25/+22 | |
migration->current. Removed white space and coding standards. | |||||
2011-11-14 | Merge pull request #670 from zwilias/develop | Derek Jones | 1 | -14/+14 | |
Use `#.` instead of simply `#` to activate github's auto-enumerator | |||||
2011-11-14 | Use `#.` instead of simply `#` to activate github's auto-enumerator | Ilias Van Peer | 1 | -14/+14 | |
2011-11-14 | Merge branch 'release/2.1.0' | Pascal Kriete | 202 | -731/+5366 | |
Conflicts: user_guide/helpers/url_helper.html | |||||
2011-11-14 | Changelogging and setting release date. | Pascal Kriete | 1 | -2/+3 | |
2011-11-14 | Tweaking the xss filter for IE <comment> tags, parameter injection, and ↵ | Pascal Kriete | 1 | -50/+41 | |
weird html5 attributes. | |||||
2011-11-14 | Removing stray docblocks | Pascal Kriete | 1 | -12/+0 | |
2011-11-13 | Fixed conflicts. | Phil Sturgeon | 6 | -165/+185 | |
2011-11-13 | Changelog tweaking the Sphinx docs to match old HTML docs for 2.1 and ↵ | Phil Sturgeon | 1 | -22/+52 | |
accurately describe what 3.0 has added so far. | |||||
2011-11-13 | More changelog tweaking. | Phil Sturgeon | 1 | -0/+3 | |
2011-11-13 | Added TLS and SSL support to Email library. Fixes issue #171 | Radu Potop | 1 | -1/+19 | |
2011-11-13 | Resolved issue 65 - made action on form_open_multipart helper function call ↵ | Ben Edmunds | 1 | -1/+1 | |
optional | |||||
2011-11-13 | Updated changelog. | Phil Sturgeon | 1 | -9/+10 | |