summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-05-17merge upstreamTimothy Warren55-1104/+1055
2012-05-17Merge pull request #1300 from timw4mail/patchAndrey Andreev12-516/+499
Fix rest of the helpers
2012-05-17Add parens to changelog entryTimothy Warren1-1/+1
2012-05-17Suggested changesTimothy Warren2-2/+2
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren2-5/+6
2012-05-17tweak and changelog entryTimothy Warren2-4/+2
2012-05-17Merge upstreamTimothy Warren82-669/+1864
2012-05-17Clean up the helpersAndrey Andreev6-43/+39
2012-05-17Remove regex validation in favor of filter_varTimothy Warren1-33/+1
2012-05-17Clean up the librariesAndrey Andreev24-414/+383
2012-05-17Cleanup the core classesAndrey Andreev15-132/+135
2012-05-16Added filter_var for newer versions of phpTimothy Warren1-0/+7
2012-05-16Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into emailTimothy Warren38-81/+1308
2012-05-16Merge pull request #1364 from toopay/core-testsAndrey Andreev2-3/+3
Reduce decimal points, since there is a micro differencess on runtime an...
2012-05-16Reduce decimal points, since there is a micro differencess on runtime and ↵Taufan Aditya2-3/+3
update travis status
2012-05-16Merge pull request #1360 from toopay/core-testsPhil Sturgeon15-15/+352
Unit tests for Benchmark, Input and Security classes.
2012-05-16Merge pull request #1359 from sourcejedi/backtrace-filter-fixAndrey Andreev1-1/+4
fix backtrace filtering
2012-05-16fix backtrace filteringAlan Jenkins1-1/+4
The backtrace was filtered to remove CI system files, but the filter was buggy. It would also filter out application files which happened to contain the string "system"... or ALL files, if the application directory is under /system/ (Perhaps the latter comes as a surprise, but it's explicitly mentioned in index.php and <http://codeigniter.com/wiki/mod_rewrite>). Instead, we should test whether the file is underneath BASEPATH (using realpath() to make sure we have the same sort of slashes).
2012-05-15Remove unused hardcoded reference from *phpunit.xml filesTaufan Aditya6-13/+1
2012-05-15Input class code-coverageTaufan Aditya6-14/+207
2012-05-15Comment block for explanationTaufan Aditya1-0/+3
2012-05-15Security Code coverageTaufan Aditya4-1/+110
2012-05-15Clean up autoloader annotationTaufan Aditya1-1/+0
2012-05-15Benchmark code-coverageTaufan Aditya2-0/+45
2012-05-15Minor changes on the pull #1355 additionsAndrey Andreev2-5/+5
2012-05-15Merge pull request #1355 from shidec/developAndrey Andreev2-0/+94
Escaping boolean data type, some DBMS (e.g., postgre) need it
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-10/+2
2012-05-15escaping boolean data type for postgre change logSoesapto Joeni Hantoro1-0/+1
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-2/+2
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-4/+0
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-1/+1
2012-05-15Escaping boolean data type on postgreSoesapto Joeni Hantoro1-0/+101
2012-05-15Merge pull request #1324 from toopay/db-testsPhil Sturgeon26-63/+856
Improved DB tests
2012-05-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into emailTimothy Warren11-123/+139
2012-05-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren13-132/+144
2012-05-13Improve the solution for issue #1342Andrey Andreev1-1/+1
2012-05-11Fix issue #1349Andrey Andreev2-3/+4
2012-05-11Remove a duplicate mobile user agent entryAndrey Andreev1-1/+0
2012-05-11User_agent library improvementsAndrey Andreev3-84/+89
2012-05-11Escaping boolean data type, some DBMS (e.g., postgre) need itSoesapto Joeni Hantoro1-1/+1
2012-05-11simpler script, add boolean handling on DB_driver/escapeSoesapto Joeni Hantoro1-14/+4
2012-05-11Generate better conditions statement on boolean field type. Actually boolean ↵Soesapto Joeni Hantoro1-1/+15
field type need TRUE or FALSE value. Common DBMS (e.g., MySQL) can substite this value with 1 or 0, but it can't be implemented on PostgreSQL. So, its better to use TRUE or FALSE value for boolean field type.
2012-05-09Fix issue #1342Andrey Andreev1-1/+1
2012-05-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developWes Baker124-2149/+3858
Conflicts: system/core/Security.php
2012-05-07Merge pull request #1330 from dixy/develop-errorsPhil Sturgeon3-3/+3
Remove -webkit prefix for box-shadow
2012-05-05Remove -webkit prefix for box-shadowdixy3-3/+3
2012-05-05Merge pull request #1325 from st2/developAndrey Andreev1-1/+1
Update system/database/drivers/interbase/interbase_utility.php
2012-05-05Added a return false if an image doesn't pass XSS cleaning to prevent ↵Wes Baker1-1/+5
file_get_contents from returning a NULL and passing through unscathed.
2012-05-04Update system/database/drivers/interbase/interbase_utility.phpCusco1-1/+1
2012-05-04Remove temporary branch from travis whitelistTaufan Aditya1-2/+1