summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-06Merge remote-tracking branch 'origin/master' into issue_1374Cory0-0/+0
2012-06-06Modifying changelog to reflect the changeCory1-0/+1
2012-06-06Add a second parameter (charset) to CI_Output::set_content_type() + fix for ↵Andrey Andreev3-3/+15
issue #666
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 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
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 Sturgeon88-600/+608
2012-06-03Added support for $_SERVER['CI_ENV'] in index.phpPhil Sturgeon3-3/+10
Remember this is entirely optional, nothing will change if you do not which to use Multiple Environments just like right now. If you DO set CI_ENV you can manipulate the switch that controls error reporting, etc, so set it to "production" on your live site to hide errors from users. If you don't require this logic you can remove it, or change it entirely to check HTTP_HOST for environment subdomains, or check IP address, etc.
2012-06-02remove staticMichiel Vugteveen1-1/+1
2012-06-02Fixing final SQLite bug introduced in 48a2baf0e288accd206f5da5031d29076e130792Alex Bilbie1-1/+1
2012-06-02Fix for bug in SQLite introduced in 48a2baf0e288accd206f5da5031d29076e130792Alex Bilbie1-1/+1
2012-06-02Fixing PDO bug introduced in 48a2baf0e288accd206f5da5031d29076e130792Alex Bilbie1-1/+1
2012-06-02Fixed bug in MySQL driver introduced in 48a2baf0e288accd206f5da5031d29076e130792Alex Bilbie1-1/+1
2012-06-02Fixed bug in PostgreSQL introduced in 48a2baf0e288accd206f5da5031d29076e130792Alex Bilbie1-1/+1
2012-06-02Fixed bug introduced in ed944a3c70a0bad158cd5a6ca5ce1f2e717aff5dAlex Bilbie1-1/+1
2012-06-02Don't assume $_ci_path is a string (could be FALSE)Alex Bilbie1-1/+1
2012-06-02Fixed bug created in `test_where_custom_string()` in ↵Alex Bilbie1-1/+1
/tests/codeigniter/database/query_builder/where_test.php by d6d1150959c95e43d310d0bc45f8bd674ff6460c
2012-06-02Changed load model examples to use lowercase model name. Fixes #1417Alex Bilbie2-9/+9
2012-06-02Changed example model name to follow the CI styleguide class naming conventionsAlex Bilbie1-1/+1
2012-06-02Replaced `==` with `===` in /application/views/welcome_message.phpAlex Bilbie1-1/+1
2012-06-02Replaced `==` with `===` and `!=` with `!==` in /testsAlex Bilbie4-9/+9
2012-06-02Replaced `==` with `===` and `!=` with `!==` in /system/librariesAlex Bilbie24-268/+268
2012-06-02Replaced `==` with `===` and `!=` with `!==` in /system/helpersAlex Bilbie13-68/+68
2012-06-02Replaced `==` with `===` and `!=` with `!==` in /system/databaseAlex Bilbie31-167/+167
2012-06-02Replaced `==` with `===` and `!=` with `!==` in /system/coreAlex Bilbie13-70/+70
2012-06-01Update user_guide_src/source/changelog.rstMickey Wu1-0/+1