summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-29Merge pull request #3121 from GrahamCampbell/patch-1Andrey Andreev1-1/+1
Fixed Typo In Security.php
2014-06-29Fixed eofGraham Campbell1-1/+1
2014-06-29Fixed typoGraham Campbell1-2/+2
2014-06-21Add CI_Encryption::create_key()Andrey Andreev2-5/+25
This was planned, we somehow forgot about it. :)
2014-06-21Fix a _potential_ flaw in password_hash()Andrey Andreev1-1/+4
2014-06-19[ci skip] Leftover from 1e83d69a52a85a4f568bfa086d658556acd48980Andrey Andreev1-2/+0
2014-06-19Remove the custom IV option from CI_EncryptionAndrey Andreev3-60/+37
It serves for no practical purpose and can only do harm.
2014-06-19Fix #3112Andrey Andreev4-15/+4
2014-06-13Merge pull request #3104 from TakayukiSakai/developAndrey Andreev2-4/+5
Make num_links=0 in pagination library possible to configure
2014-06-13Fixed the changelog entry againTakayuki Sakai1-1/+1
2014-06-13Fixed a changelog entryTakayuki Sakai1-1/+1
2014-06-13Add a changelog entry in Pagination Library sectionTakayuki Sakai1-0/+1
2014-06-13Make 'num_links=0' configuration available in Pagination libraryTakayuki Sakai1-4/+4
Changed conditions when making 'first' and 'last' links
2014-06-13Revert "Make num_links=0 in pagination library possible to configure"Takayuki Sakai1-15/+9
This reverts commit a01924d2cc2d63d2bddbee85a18b423b88a9b19e.
2014-06-13Make num_links=0 in pagination library possible to configureTakayuki Sakai1-9/+15
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