summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-06-07Merge upstream branchAndrey Andreev181-4055/+6060
2012-06-07Merge pull request #972 from narfbg/develop-db-mssqlAndrey Andreev5-89/+49
2012-06-07Add a changelog noteAndrey Andreev1-0/+1
2012-06-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssqlAndrey Andreev1-1/+1
2012-06-07Fix a syntax errorAndrey Andreev1-1/+1
2012-06-07Merge upstream branchAndrey Andreev179-3970/+6015
2012-06-07Merge pull request #978 from narfbg/develop-db-sqliteAndrey Andreev2-98/+40
2012-06-07Some more minor improvementsAndrey Andreev2-13/+8
2012-06-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqliteAndrey Andreev23-90/+114
2012-06-07Merge https://github.com/EllisLab/CodeIgniter into test-encryption-classJoffrey Jaffeux25-105/+138
2012-06-07tests for encryption classJoffrey Jaffeux2-0/+86
2012-06-07replace get_config by config_itemJoffrey Jaffeux1-2/+1
2012-06-07Merge pull request #1440 from jjaffeux/patch-1Phil Sturgeon1-2/+0
2012-06-07Removed UserVoice linkJoffrey JAFFEUX1-2/+0
2012-06-07Merge pull request #1436 from jjaffeux/tests-text-helperAndrey Andreev1-1/+17
2012-06-07Fix issue #861 (and previous commit, for that matter)Andrey Andreev3-5/+4
2012-06-07Added a work-around for MSSQL/SQLSRV create_table() with INT column types (co...Andrey Andreev3-2/+4
2012-06-07Suppress errors from file_get_contents() in read_file()Andrey Andreev1-1/+1
2012-06-07Revert 296ab9a06e3c648de56861ad67581236a6dae71a - there's no bug to fixAndrey Andreev2-4/+3
2012-06-07Deprecated do_hash() and read_file() in favor of hash() and file_get_contents...Andrey Andreev8-43/+29
2012-06-07Remove some unnecessary function_exists() checks and some minor improvementsAndrey Andreev5-26/+16
2012-06-07Merge pull request #1438 from IT-Can/form-helper-fixAndrey Andreev1-6/+9
2012-06-07fixesMichiel Vugteveen1-3/+3
2012-06-06Merge pull request #1435 from jjaffeux/valid-ipv6Andrey Andreev3-1/+17
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
2012-06-06Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into issue_...Cory13-179/+117
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
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 i...Andrey Andreev3-3/+15
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