summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-06-08Merge pull request #1433 from jjaffeux/test-encryption-classAndrey Andreev1-2/+1
2012-06-08escape_identifiers() to accept arrays as wellAndrey Andreev14-34/+37
2012-06-08Added MSSQL/SQLSRV field escaping support with QUOTE_IDENTIFIER detection (is...Andrey Andreev3-16/+73
2012-06-08Add a default _from_tables() method to CI_DB_query_builder and remove it from...Andrey Andreev12-157/+23
2012-06-08Revert back some escape_identifiers() to proect_identifiers() as the first on...Andrey Andreev12-28/+25
2012-06-08Resolve formatting differences between DB forge driversAndrey Andreev10-222/+209
2012-06-07Resolve description docblock differences in system/language/Andrey Andreev12-29/+29
2012-06-07Merge upstream branchAndrey Andreev102-2972/+2404
2012-06-07Merge upstream branchAndrey Andreev106-3562/+4078
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 Andreev104-3477/+4034
2012-06-07Some more minor improvementsAndrey Andreev2-13/+8
2012-06-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqliteAndrey Andreev13-67/+46
2012-06-07Merge https://github.com/EllisLab/CodeIgniter into test-encryption-classJoffrey Jaffeux14-83/+62
2012-06-07replace get_config by config_itemJoffrey Jaffeux1-2/+1
2012-06-07Fix issue #861 (and previous commit, for that matter)Andrey Andreev2-4/+2
2012-06-07Added a work-around for MSSQL/SQLSRV create_table() with INT column types (co...Andrey Andreev2-0/+2
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 Andreev1-3/+3
2012-06-07Deprecated do_hash() and read_file() in favor of hash() and file_get_contents...Andrey Andreev4-30/+10
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-06fixesMichiel Vugteveen1-4/+7
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux1-3/+3
2012-06-06removed ip_version()Joffrey Jaffeux1-21/+1
2012-06-06form_checkbox set_value fixMichiel Vugteveen1-2/+2
2012-06-06Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into issue_...Cory7-175/+88
2012-06-06styling guide false -> FALSEJoffrey Jaffeux1-1/+1
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux1-2/+8
2012-06-06ip_version() now returns int instead of stringJoffrey Jaffeux1-3/+3
2012-06-06Add a second parameter (charset) to CI_Output::set_content_type() + fix for i...Andrey Andreev1-2/+8
2012-06-06follow styling guideJoffrey Jaffeux1-1/+1
2012-06-06Add support for ipv6Joffrey Jaffeux1-1/+21
2012-06-06Merge upstream branch and some changes for better readabilityAndrey Andreev98-2480/+2110
2012-06-06Merge pull request #1415 from mickeywu/developAndrey Andreev1-16/+16
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 is...Andrey Andreev2-3/+3
2012-06-05Added get_mimes() function to system/core/Commons.php.The MIMEs array from co...Andrey Andreev6-153/+60
2012-06-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-22/+18
2012-06-04Direct return from mimes config, instead of using global $mimes;Phil Sturgeon4-13/+9
2012-06-04Merge pull request #1403 from cryode/bug/cache_backupPhil Sturgeon1-21/+17
2012-06-04Merge pull request #1420 from IT-Can/fix-issue-1419Andrey Andreev1-1/+1
2012-06-04Loader was too specific about === "", some cases were NULL.Phil Sturgeon1-1/+1
2012-06-04Fix issue #1423Andrey Andreev1-2/+2
2012-06-04Alter SQLite3's version() method and clear some spacesAndrey Andreev2-2/+2
2012-06-04Fix an SQLite3 pconnect() bug + other minor changesAndrey Andreev3-5/+5
2012-06-04Revert/optimize some changes from 773ccc318f2769c9b7579630569b5d8ba47b114b an...Andrey Andreev7-20/+20