summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-06-04Merge pull request #3079 from seanfahey/developAndrey Andreev1-1/+1
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
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-03#3073: Fix an undefined variable errorAndrey Andreev1-9/+12
2014-06-02Disable session testsAndrey Andreev1-0/+14
2014-06-02#3073: BC workarounds for sess_use_database, sess_expire_on_closeAndrey Andreev2-0/+11
2014-06-02Fix Session_database_driver lockingAndrey Andreev1-7/+9
2014-06-01Merge pull request #3074 from aanbar/output_documentationAndrey Andreev1-1/+25
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
2014-05-31[ci skip] A quick and dirty fix for allowing 'sess_driver' configurationAndrey Andreev1-1/+5
2014-05-31Merge branch 'develop' into feature/sessionAndrey Andreev3-55/+16
2014-05-31Remove CI_Encrypt::_xor_encode()Andrey Andreev2-54/+14
2014-05-31[ci skip] Update changelogAndrey Andreev1-1/+2
2014-05-31Merge branch 'develop' into feature/sessionAndrey Andreev2-3/+18
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
2014-05-31A fix about loading language files - ensuring suffix '_lang' presence properly.Ivan Tcholakov1-1/+1
2014-05-31Initial version of new Session libraryAndrey Andreev8-1489/+1256
2014-05-27Merge pull request #3065 from dtmax/developAndrey Andreev1-1/+1
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
2014-05-22Update profiling.rstManu Ganji1-2/+2
2014-05-22Update profiling.rstManu Ganji1-2/+4
2014-05-20Merge pull request #3058 from vlakoff/word_wrapAndrey Andreev2-13/+12
2014-05-20Pick up some changes from text helpervlakoff1-5/+5
2014-05-20Fix handling of {unwrap} tags in word_wrap() functionsvlakoff2-6/+5
2014-05-20Regex fixesvlakoff2-2/+2
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
2014-05-19Remove static cache in Email->_mimes_types()vlakoff1-9/+1
2014-05-19Fix caching of MIME configvlakoff2-10/+20
2014-05-19Merge pull request #3053 from vlakoff/get_configAndrey Andreev1-7/+4
2014-05-19Simplify code in get_config()vlakoff1-7/+4
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
2014-05-18Merge pull request #3055 from ilatif/developAndrey Andreev1-1/+1
2014-05-18Adjust docblock of load_class()vlakoff1-1/+1
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
2014-05-16[ci skip] Manually apply an improved version of PR #3034 (doc fixes)Andrey Andreev1-4/+4