summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-06remove text about ipv4/ipv6 support in the docJoffrey Jaffeux1-1/+1
2012-06-06fixesMichiel Vugteveen1-4/+7
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux2-3/+4
2012-06-06removed ip_version()Joffrey Jaffeux4-45/+2
2012-06-06form_checkbox set_value fixMichiel Vugteveen1-2/+2
2012-06-06Merge pull request #1437 from ckdarby/issue_1374Andrey Andreev2-3/+4
Fixing extra td; Issue #1374
2012-06-06Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Cory13-179/+117
issue_1374 Conflicts: user_guide_src/source/changelog.rst
2012-06-06use an ip of the range 192.18.0.0/15Joffrey Jaffeux1-2/+2
2012-06-06Merge remote-tracking branch 'origin/master' into issue_1374Cory0-0/+0
2012-06-06styling guide false -> FALSEJoffrey Jaffeux1-1/+1
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux5-7/+21
Conflicts: user_guide_src/source/changelog.rst
2012-06-06Modifying changelog to reflect the changeCory1-0/+1
2012-06-06remove regex in favor of strposJoffrey Jaffeux1-2/+1
2012-06-06ip_version() now returns int instead of stringJoffrey Jaffeux2-5/+5
2012-06-06correction of the test and longer test stringJoffrey Jaffeux1-3/+3
2012-06-06typo word_wraped -> word_wrappedJoffrey Jaffeux1-4/+4
2012-06-06add test for word_wrap default charlimJoffrey Jaffeux1-2/+11
2012-06-06test for word_wrap()Joffrey Jaffeux1-0/+8
2012-06-06Add a second parameter (charset) to CI_Output::set_content_type() + fix for ↵Andrey Andreev3-3/+15
issue #666
2012-06-06change ellipsizing to ellipsizeJoffrey Jaffeux1-1/+1
2012-06-06follow styling guideJoffrey Jaffeux2-3/+5
2012-06-06bad spacingJoffrey Jaffeux1-1/+1
2012-06-06update documentation for ip_version() and tells valid_ip() now supports ipv6Joffrey Jaffeux1-1/+10
2012-06-06update changelog for ipv6 supportJoffrey Jaffeux1-0/+1
2012-06-06add tests for ipv6 and new method ip_version()Joffrey Jaffeux1-0/+27
2012-06-06Add support for ipv6Joffrey Jaffeux1-1/+21
2012-06-06Merge pull request #933 from wrightlabs/patch-1Andrey Andreev1-0/+1
Add Security class to list of core classes in docs
2012-06-06Added Fennec as Firefox Mobile to config/user_agents.php (issue #1063)Andrey Andreev2-4/+5
2012-06-06Merge upstream branch and some changes for better readabilityAndrey Andreev166-2956/+4029
2012-06-06Merge pull request #1415 from mickeywu/developAndrey Andreev3-16/+25
Made set_header() public in Email library and updated documentation.
2012-06-06Update developMickey Wu1-1/+1
2012-06-05Replace set_magic_quotes_runtime() with an ini_set() callAndrey Andreev1-1/+1
2012-06-05Fixing extra td; Issue #1374Cory1-3/+3
2012-06-05Fix a magic_quotes-related bug and changed the default parameter value for ↵Andrey Andreev3-3/+4
is_php()
2012-06-05Added get_mimes() function to system/core/Commons.php.The MIMEs array from ↵Andrey Andreev8-153/+67
config/mimes.php is used by multiple core classes, libraries and helpers and each of them has implemented an own way of getting it, which is not needed and is hard to maintain. This also fixes issue #1411
2012-06-05Merge pull request #1425 from jjaffeux/developPhil Sturgeon1-4/+5
Add test when loading language file and not using the language parameter
2012-06-05remove _test_line()Joffrey Jaffeux1-8/+1
2012-06-05Add test when loading language file and not using the second parameter ↵Joffrey Jaffeux1-2/+10
(language)
2012-06-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-22/+19
2012-06-04Direct return from mimes config, instead of using global $mimes;Phil Sturgeon5-143/+139
Global variables are generally a terrible idea, especially for something as simple as this. The mimes.php now returns an array instead of just injecting a variable name into the global namespace.
2012-06-04Merge pull request #1403 from cryode/bug/cache_backupPhil Sturgeon1-21/+17
Fix issue where cache backup is ignored on first call.
2012-06-04Merge pull request #1420 from IT-Can/fix-issue-1419Andrey Andreev2-1/+2
Fix issues #1397, #1419
2012-06-04Loader was too specific about === "", some cases were NULL.Phil Sturgeon1-1/+1
Signed-off-by: Phil Sturgeon <email@philsturgeon.co.uk>
2012-06-04changelogMichiel Vugteveen1-0/+1
2012-06-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-2/+2
2012-06-04Added a "non-DB" phpunit.xml for local testingPhil Sturgeon1-0/+25
Any developer can use this without having to set up DB's and have PostgreSQL installed by running: phpunit --configuration=tests/phpunit.xml This just skips DB stuff, so code coverage will look lower than it is.
2012-06-04Fix issue #1423Andrey Andreev1-2/+2
2012-06-04Alter SQLite3's version() method and clear some spacesAndrey Andreev3-6/+6
2012-06-04Fix an SQLite3 pconnect() bug + other minor changesAndrey Andreev5-10/+10
2012-06-04Revert/optimize some changes from 773ccc318f2769c9b7579630569b5d8ba47b114b ↵Andrey Andreev7-20/+20
and d261b1e89c3d4d5191036d5a5660ef6764e593a0