summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-01-29[ci skip] Add some changelog entriesAndrey Andreev1-3/+9
2013-01-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev4-2/+5
2013-01-29Replace is_file() with the faster file_exists()Andrey Andreev8-38/+65
(where it makes sense) Also: - Implemented caching of configuration arrays for smileys, foreign characters and doctypes. - Implemented cascading-style loading of configuration files (except for library configs, DB and constants.php).
2013-01-29Merge pull request #2204 from starsquare/developAndrey Andreev3-0/+3
Fix list_fields seek bug
2013-01-29Fix list_fields seek bugChris Buckley3-0/+3
On the first list_fields call, the field pointer is moved to the end of the list of fields. This change ensures that the pointer is positioned at the start of the field list before grabbing the names. Signed-off-by: Chris Buckley <chris@cmbuckley.co.uk>
2013-01-28Merge pull request #2203 from vlakoff/developAndrey Andreev1-2/+2
Adjustments in routing documentation
2013-01-28Adjustments in routing documentationvlakoff1-2/+2
* fixed syntax error for "note" banner * more useful example, in previous one there was no need for strtolower, nor for a callback
2013-01-28Fix issue #2202 and alter Loader Class docsAndrey Andreev2-75/+73
2013-01-28Some micro-optimization to the Driver library loaderAndrey Andreev1-10/+9
2013-01-28Fix issue #2179Andrey Andreev1-1/+1
2013-01-28Update unit tests with the ucfirst-library-filename requirementAndrey Andreev1-9/+9
2013-01-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-1/+8
2013-01-28Libraries' filenames must be named in a ucfirst-like mannerAndrey Andreev5-90/+90
2013-01-28Merge pull request #2201 from xeptor/developAndrey Andreev1-1/+8
Upload library, clean_file_name function: Fix xss bug.
2013-01-28Remove str_replace in returngommarah1-1/+1
2013-01-28Upload library, clean_file_name function: Fix xss bug.gommarah1-0/+7
For example: If you clear this string "%%3f3f" according to the $bad array will fail. The result will be "%3f" Because str_replace() replaces left to right. Signed-off-by: xeptor <servetozkan@live.com>
2013-01-28Fix auto_link() for the Nth timeAndrey Andreev2-14/+16
- anchor() is for local links and breaks ones that don't have a protocol prefix - Allow :// links (no actual protocol specified) - Further simplified the URL regular expression
2013-01-28Add ENVIRONMENT constant to unit testsAndrey Andreev1-0/+1
2013-01-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-2/+2
2013-01-28Remove unnecessary defined('ENVIRONMENT') checksAndrey Andreev12-19/+15
As suggested in issue #2134 & PR #2149
2013-01-28Merge pull request #2198 from cryode/bug/input-newlineAndrey Andreev1-2/+2
Fix newline standardization.
2013-01-28Fix newline standardization.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-28Merge pull request #2197 from dontforget/patch-1Andrey Andreev1-1/+1
Fixing issue with comma
2013-01-27Fixing issue with commadontforget1-1/+1
2013-01-26Merge pull request #2195 from rebornishard/patch-1Andrey Andreev1-1/+2
Add webm mime type
2013-01-26Add webm mime typerebornishard1-1/+2
http://www.webmproject.org/about/faq/
2013-01-26Merge pull request #2194 from vlakoff/developAndrey Andreev1-1/+1
Fix a code comment in Image_lib
2013-01-26Fix a code comment in Image_libvlakoff1-1/+1
constant FILE_WRITE_MODE contains octal 0666
2013-01-25Merge pull request #2192 from tkaw220/developAndrey Andreev1-1/+1
Fix issue #2191.
2013-01-25Fix issue #2191.Edwin Aw1-1/+1
Signed-off-by: Edwin Aw <tkaw220@gmail.com>
2013-01-24Move db_select() call from CI_DB_driver::initialize() to db_connect()Andrey Andreev6-17/+30
so that it's only called by drivers that need it ('mysql', 'mssql'). As proposed in issue #2187.
2013-01-24Merge pull request #2186 from 12k/patch-1Andrey Andreev1-2/+2
Removed slash from URI helper doc
2013-01-23Removed slash from URI helper docMelvin Lammerts1-2/+2
In my current projects I don't see '/controller/method' but 'controller/method' when calling uri_string().
2013-01-23Merge pull request #2185 from OsamaAbbas/patch-1Andrey Andreev1-2/+2
Update application/config/config.php
2013-01-23Update application/config/config.phpOsamaAbbas1-2/+2
2013-01-22Merge pull request #2164 from cryode/bug/auto_linkAndrey Andreev1-27/+18
Fix and optimize auto_link() URL helper function.
2013-01-21Adjust regex.Eric Roberts1-1/+1
2013-01-21Partially implement PR #2155Andrey Andreev2-0/+3
2013-01-21[ci skip] Manually apply #2162, #2163Andrey Andreev2-2/+3
2013-01-21[ci skip] Add text/plain as a valid MIME for js,css,*html,xmlAndrey Andreev1-6/+6
2013-01-21Merge pull request #2171 from purwandi/minify-table-blockAndrey Andreev1-4/+4
Support minify table block in output
2013-01-19Support minify table blockPurwandi1-4/+4
2013-01-19Remove whitespace from empty lines.Eric Roberts1-5/+5
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-18Merge pull request #2151 from cryode/feature/output-cache-improvementsAndrey Andreev1-4/+18
Add headers to Output class cache files.
2013-01-18Return spacing on var definitions.Eric Roberts1-6/+6
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-18Fix and optimize auto_link() URL helper function.Eric Roberts1-31/+22
Signed-off-by: Eric Roberts <eric@cryode.com>
2013-01-17Fix issues #2160, #2161Andrey Andreev1-11/+6
2013-01-17Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Eric Roberts13-50/+56
feature/output-cache-improvements
2013-01-15Merge pull request #2152 from vlakoff/developAndrey Andreev12-27/+27
Replace is_null() with === / !== NULL
2013-01-15A few adjustments to previous commitvlakoff2-2/+2