summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
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-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
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
Made set_header() public in Email library and updated documentation.
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 Andreev2-3/+3
is_php()
2012-06-05Added get_mimes() function to system/core/Commons.php.The MIMEs array from ↵Andrey Andreev6-153/+60
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-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
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 Andreev1-1/+1
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-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 ↵Andrey Andreev7-20/+20
and d261b1e89c3d4d5191036d5a5660ef6764e593a0
2012-06-04Revert/optimize some changes from 48a2baf0e288accd206f5da5031d29076e130792Andrey Andreev9-25/+25
2012-06-04Revert/optimize some changes from ed944a3c70a0bad158cd5a6ca5ce1f2e717aff5dAndrey Andreev9-16/+19
2012-06-03Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon80-575/+579
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 04:13:00 +0100