summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-06-11get upload data with index keyMichiel Vugteveen1-11/+19
2012-06-10Remove a non-existent variable usageAndrey Andreev1-1/+1
2012-06-10Fix _where() with multiple condition custom queryAndrey Andreev2-2/+2
2012-06-10Add BETWEEN to _has_operator()Andrey Andreev1-1/+1
2012-06-10Fix _where() escaping operatorsAndrey Andreev2-10/+8
2012-06-10Fix count_all()Andrey Andreev1-1/+1
2012-06-10Fix issue #1452Andrey Andreev5-17/+42
2012-06-10Merge branch 2.1-stable into developAndrey Andreev4-11/+26
2012-06-09Fix defined() usage in system/core/Common.phpAndrey Andreev1-1/+1
2012-06-09Cleanup the new Redis cache driver and add a changelog entry for itAndrey Andreev2-48/+63
2012-06-09Merge pull request #948 from mptre/developAndrey Andreev2-3/+225
Added redis cache driver
2012-06-08Return $this when values ($key OR $values) is NULLRafael Queiroz1-1/+1
2012-06-08Fix issue #1447Andrey Andreev1-1/+1
2012-06-08Update OFFSET implementation for SQL Server 2012Andrey Andreev1-6/+3
2012-06-08Add OFFSET support for SQL Server 2012Andrey Andreev1-0/+6
2012-06-08Merge pull request #1433 from jjaffeux/test-encryption-classAndrey Andreev1-2/+1
Test encryption class
2012-06-08escape_identifiers() to accept arrays as wellAndrey Andreev14-34/+37
2012-06-08Added MSSQL/SQLSRV field escaping support with QUOTE_IDENTIFIER detection ↵Andrey Andreev3-16/+73
(issue #706)
2012-06-08Fixed according to feedback.Anton Lindqvist1-5/+6
2012-06-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developAnton Lindqvist123-4928/+5136
Conflicts: system/libraries/Cache/Cache.php
2012-06-08Add a default _from_tables() method to CI_DB_query_builder and remove it ↵Andrey Andreev12-157/+23
from most of the drivers
2012-06-08Revert back some escape_identifiers() to proect_identifiers() as the first ↵Andrey Andreev12-28/+25
one can't handle arrays
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 ↵Andrey Andreev2-0/+2
(column lengths are not supported)
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 ↵Andrey Andreev4-30/+10
file_get_contents() respectively
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
Form helper fixes for issues triggered by 773ccc318f2769c9b7579630569b5d8ba47b114b
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 ↵Cory7-175/+88
issue_1374 Conflicts: user_guide_src/source/changelog.rst
2012-06-06styling guide false -> FALSEJoffrey Jaffeux1-1/+1
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux1-2/+8
Conflicts: user_guide_src/source/changelog.rst
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 ↵Andrey Andreev1-2/+8
issue #666