summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-07-06Return 403 instead of 500 if no CSRF token givenKyle Valade1-2/+2
2014-07-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-1/+1
2014-07-06Fix #3131Andrey Andreev1-0/+4
2014-07-05Merge pull request #3130 from dionysiosarvanitis/fix/pdo_result__list_fieldsAndrey Andreev1-1/+1
2014-07-05Missing looping index added. Without index empty rows returned for csv column...Dionysis Arvanitis1-1/+1
2014-07-02Remove GCM mode from CI_Encryption (OpenSSL)Andrey Andreev2-14/+8
2014-07-01Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-1/+1
2014-07-01Fix #3124Andrey Andreev1-2/+2
2014-06-29Merge pull request #3121 from GrahamCampbell/patch-1Andrey Andreev1-1/+1
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
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
2014-06-19Fix #3112Andrey Andreev4-15/+4
2014-06-13Merge pull request #3104 from TakayukiSakai/developAndrey Andreev2-4/+5
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
2014-06-13Revert "Make num_links=0 in pagination library possible to configure"Takayuki Sakai1-15/+9
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
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
2014-06-05Updating table template prototype id documentationAdwinTrave1-15/+21
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-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-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
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