summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-12Merge pull request #3103 from dickfu/fix_config_loadAndrey Andreev1-1/+2
config load bug fix
2014-06-12remove the empty line at the end of fileFu Xu1-1/+1
2014-06-12style changeFu Xu1-1/+1
2014-06-12config load bug fixFu Xu1-2/+3
2014-06-12Fix #3101Andrey Andreev1-1/+1
2014-06-07Fix #3085Andrey Andreev1-17/+19
2014-06-05Merge pull request #3082 from AdwinTrave/developAndrey Andreev1-15/+21
Updating table template prototype in documentation
2014-06-05Updating table template prototype id documentationAdwinTrave1-15/+21
Updating template prototype in documentation to reflect the actual template prototype in the table library.
2014-06-04Merge pull request #3079 from seanfahey/developAndrey Andreev1-1/+1
Added MIME types for .ppt uploads
2014-06-04Seriously, remove the line endingsean1-1/+1
2014-06-03Removed errant newlineSean Fahey0-0/+0
2014-06-03Another ppt mime typeSean Fahey1-1/+1
2014-06-03Added 'application/vnd.ms-office' MIME for pptSean Fahey1-2/+2
An export from Apple's Numbers to .ppt gives a MIME of application/vnd.ms-office
2014-06-03Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-1/+25
2014-06-03Fix a potential undefined variable errorAndrey Andreev2-2/+2
2014-06-01Merge pull request #3074 from aanbar/output_documentationAndrey Andreev1-1/+25
Added _display documentation.
2014-06-01Fix wrong variable nameAndrey Andreev1-2/+2
2014-06-01reduced line length.Ahmad Anbar1-2/+2
2014-06-01Fixed code style.Ahmad Anbar1-14/+10
2014-05-31Add support for non-ASCII domain names in FV & Email classes' valid_email()Andrey Andreev3-0/+12
Depends on the Intl extension
2014-05-31Remove CI_Encrypt::_xor_encode()Andrey Andreev2-54/+14
2014-05-31[ci skip] Update changelogAndrey Andreev1-1/+2
2014-05-31[ci skip] Update changelogAndrey Andreev1-2/+17
2014-05-31Added _display documentation.Ahmad Anbar1-1/+29
2014-05-31Merge pull request #3072 from ivantcholakov/developAndrey Andreev1-1/+1
A fix about loading language files - ensuring suffix '_lang' presence properly.
2014-05-31A fix about loading language files - ensuring suffix '_lang' presence properly.Ivan Tcholakov1-1/+1
2014-05-27Merge pull request #3065 from dtmax/developAndrey Andreev1-1/+1
fix calling of callable hooks
2014-05-27fix callable hooksMax1-1/+1
2014-05-27fix callable hooksMax1-1/+1
2014-05-23Fix #3057Andrey Andreev2-66/+68
2014-05-22Merge pull request #3059 from manuganji/patch-1Andrey Andreev1-2/+4
Update profiling.rst
2014-05-22Update profiling.rstManu Ganji1-2/+2
correcting rst syntax
2014-05-22Update profiling.rstManu Ganji1-2/+4
There is some confusion about how to enable profiling for queries. This will save some time for devs who want to debug their generated SQL.
2014-05-20Merge pull request #3058 from vlakoff/word_wrapAndrey Andreev2-13/+12
Fixes in word_wrap() functions
2014-05-20Pick up some changes from text helpervlakoff1-5/+5
refs 6ce4746474ddf050f7f4df61b7a22b7f5854d533
2014-05-20Fix handling of {unwrap} tags in word_wrap() functionsvlakoff2-6/+5
* in Email library: these tags were not removed * in text helper: simplified code
2014-05-20Regex fixesvlakoff2-2/+2
* Replace wrong "wwww." with "www." * Escape dot
2014-05-20[ci skip] Fix error notices in FV when trying to lookup error msgs for closuresAndrey Andreev1-14/+18
2014-05-19Merge pull request #3052 from vlakoff/mimeAndrey Andreev2-13/+15
Fix caching of MIME config
2014-05-19Remove static cache in Email->_mimes_types()vlakoff1-9/+1
Saving one function call isn't worth the code overhead.
2014-05-19Fix caching of MIME configvlakoff2-10/+20
* in get_mimes(): was missing isset() test * in Email->_mimes_types(): static cache of reference was noneffective refs 6ef498b49946ba74d610b3805fb908b163a7f03a
2014-05-19Merge pull request #3053 from vlakoff/get_configAndrey Andreev1-7/+4
Simplify code in get_config()
2014-05-19Simplify code in get_config()vlakoff1-7/+4
Exact same behavior. The reference was just redundant.
2014-05-18[ci skip] Add a note to CI_Model::__get() (issue #3046)Andrey Andreev1-0/+4
2014-05-18Merge pull request #3056 from vlakoff/docblockAndrey Andreev1-1/+1
Adjust docblock of load_class()
2014-05-18Merge pull request #3055 from ilatif/developAndrey Andreev1-1/+1
Fixed wrong url for Style Guide in Contributing Guide
2014-05-18Adjust docblock of load_class()vlakoff1-1/+1
refs c26b9ebb00e29be2e972fece3bcf73d33249a64b
2014-05-17Fixed wrong url for Style Guide in Contributing GuideImran Latif1-1/+1
2014-05-17Merge pull request #3050 from emmanuelgrognet/developAndrey Andreev1-1/+1
fix wrong if expression in link_tag
2014-05-16[ci skip] Manually apply an improved version of PR #3034 (doc fixes)Andrey Andreev1-4/+4