summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-10-09Alter CI_Emai::_prep_quoted_printable()Andrey Andreev2-3/+12
2012-10-09Remove an unnecessary variable initializationAndrey Andreev1-1/+1
2012-10-09Merge changes from developAndrey Andreev29-277/+148
2012-10-09Set REMOTE_ADDR in testsAndrey Andreev1-0/+1
2012-10-09Merge changes from 2.1-stableAndrey Andreev2-55/+69
2012-10-09Missed an underscore ... dohAndrey Andreev1-1/+1
2012-10-09Really fix that FROM group conditionAndrey Andreev5-5/+5
2012-10-09Alter fix for issue #1257Andrey Andreev6-1/+118
2012-10-09Merge pull request #1863 from Erocanti/patch-1Andrey Andreev1-1/+1
Lil' typo: Changed Lunix for Linux
2012-10-09Changed Lunix for Linux Erocanti1-1/+1
"Lunix" while going over cli docs.
2012-10-09Fix issue #1862Andrey Andreev1-1/+1
2012-10-08[ci skip] Polish changes from pull #1709Andrey Andreev2-2/+2
2012-10-08Merge pull request #1709 from bbarao/developAndrey Andreev2-2/+3
Fix email headers when using long email subjects and \r\n as crlf.
2012-10-08Fix email headers when using long email subjects and \r\n as crlf. (Part2)Bruno Barão2-2/+3
- Better expression for the preg_replace. - Added a entry to the changelog.
2012-10-08Merge remote-tracking branch 'upstream/develop' into developBruno Barão106-1244/+3446
2012-10-07Fix a typo [ci skip]Andrey Andreev1-1/+1
2012-10-06Fix issue #1257Andrey Andreev17-259/+2
2012-10-06[ci skip] Alter some changelog entriesAndrey Andreev2-5/+9
2012-10-06Add IPv6 and array() support for *proxy_ips* configurationAndrey Andreev3-59/+121
2012-10-05Merge pull request #918 from narfbg/develop-dh-date-rangeAndrey Andreev4-2/+181
Added date_range() to the Date helper
2012-10-05Add unit testAndrey Andreev1-0/+23
2012-10-05Remove an empty lineAndrey Andreev1-1/+1
2012-10-05Merge upstream branchAndrey Andreev309-8335/+13656
2012-10-05Fix issue #1765Andrey Andreev2-2/+11
2012-10-05[ci skip] Add Vietnamese characters to foreign_chars.phpAndrey Andreev2-13/+13
2012-10-05[ci skip] More doc fixesAndrey Andreev2-2/+2
2012-10-05[ci skip] Small doc fixes, thanks dchill42Andrey Andreev2-2/+2
2012-10-05Fix SQLite3 DB error handlingAndrey Andreev1-15/+6
2012-10-05Fix #1745Andrey Andreev3-3/+6
2012-10-05Merge pull request #1738 from RecoilUK/patch-1Andrey Andreev1-0/+9
Update user_guide_src/source/libraries/form_validation.rst
2012-10-05Polish changes from #1586Andrey Andreev3-6/+6
2012-10-05Merge pull request #1586 from melounek/email_return_pathAndrey Andreev3-4/+21
added parameter for returned-path in Email::from()
2012-10-05Fix issue #1692Andrey Andreev2-4/+11
2012-10-05update devel versionMelounek176-3353/+8138
2012-10-05Merge pull request #1682 from dhinus/patch-1Andrey Andreev1-7/+6
Logging should obey error_reporting() setting
2012-10-05Fix issue #1340 [ci skip]Andrey Andreev1-0/+1
2012-10-05[ci skip] Fix up the cheatsheets page (original pull #1244)Andrey Andreev2-4/+11
2012-10-05Add PNG transparency support in CI_Image_lib::text_watermark() (originally ↵Andrey Andreev2-4/+12
from pull #1317, partially fixes #1139)
2012-10-05[ci skip] Add a note to the user guide regarding issue #1010Andrey Andreev1-2/+3
2012-10-05Fix issue #935 [ci skip]Andrey Andreev1-2/+2
2012-10-05Merge pull request #1854 from tocaibiza/developAndrey Andreev1-4/+4
Bug-fix in XML-RPC library [ci skip]
2012-10-05Manually apply pull #300 (fixes #295) [ci skip]Andrey Andreev4-15/+22
2012-10-05Bug-fix in XML-RPC libraryDimitar1-4/+4
$type and $typeof are passed as strings in this function, therefore I took the easy way and simplified the validation. I tested with different requests (strings, numbers ..), no other issues found.
2012-10-05Fix issue #116 + other space/style fixes [ci skipAndrey Andreev5-17/+16
2012-10-05Merge pull request #1848 from blyxx86/developAndrey Andreev2-0/+6
Unit test bugfix to allow setting columns for report method.
2012-10-05Fixed conflicts in changelog to reflect all changes.Kyle Johnson22-100/+60
Conflicts: user_guide_src/source/changelog.rst
2012-10-05Merge pull request #1851 from daniel-honestempire/developAndrey Andreev2-5/+2
DRY determining server protocol
2012-10-04Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developDaniel Morris19-93/+52
2012-10-04Compatibility with PHP 5.2.4 and enclosed ternary operationDaniel Morris1-1/+1
Signed-off-by: Daniel Morris <daniel@honestempire.com>
2012-10-04Default to HTTP/1.1 if $server_protocol is not setDaniel Morris1-1/+1
Signed-off-by: Daniel Morris <daniel@honestempire.com>