summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-10Merge pull request #4754 from tianhe1986/develop_fix_unit_test_nameAndrey Andreev1-1/+1
CI_Unit_test: Fix translation of result datatype
2016-08-09CI_Unit_test: Fix name of visible test items.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
Change ... for the sake of change
2016-07-31Changed the return value of CI_DB_result::_fetch_object(..) to objectMasterklavi1-1/+1
2016-07-26Fix Travis buildsAndrey Andreev1-3/+0
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev58-428/+669
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst
2016-07-26[ci skip] Mark the start of 3.1.1 developmentAndrey Andreev6-4/+33
2016-07-26[ci skip] More on dropping 5.2.xAndrey Andreev5-9/+21
2016-07-26[ci skip] Officially drop PHP 5.2.xAndrey Andreev2-4/+1
2016-07-26[ci skip] Minor documentation fixesAndrey Andreev2-1/+2
2016-07-26Prepare for 3.1.0 releaseClaudio Galdiolo8-24/+37
2016-07-26[ci skip] Add changelog entries for security patchesAndrey Andreev1-0/+5
2016-07-26[ci skip] WhitespaceAndrey Andreev1-1/+1
2016-07-26Fix SQLi in ODBC driversAndrey Andreev2-124/+118
2016-07-26Merge pull request #4709 from nopesled/developAndrey Andreev1-1/+1
Filter php:// wrappers in set_realpath() helper
2016-07-26Merge pull request #4709 from nopesled/developAndrey Andreev1-1/+1
Filter php:// wrappers in set_realpath() helper
2016-07-25[ci skip] Fix a changelog entry from last commitAndrey Andreev1-1/+1
2016-07-25[ci skip] Add changelog entries for PRs #4724, #4725Andrey Andreev1-0/+2
2016-07-25Merge pull request #4725 from tianhe1986/develop_url_encode_case_insensitiveAndrey Andreev2-2/+14
Fix remove_invisible_characters() for URL-encoded characters in upper case
2016-07-25Merge pull request #4724 from tianhe1986/develop_is_https_strtolowerAndrey Andreev1-1/+1
Compare X-Forwarded-Proto case-insensitively
2016-07-25Merge pull request #4725 from tianhe1986/develop_url_encode_case_insensitiveAndrey Andreev2-2/+14
Fix remove_invisible_characters() for URL-encoded characters in upper case
2016-07-25Merge pull request #4724 from tianhe1986/develop_is_https_strtolowerAndrey Andreev1-1/+1
Compare X-Forwarded-Proto case-insensitively
2016-07-22Replace url_encoded invisible characters case-insensitively.tianhe19862-2/+14
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-22Call strtolower before comparing $_SERVER['HTTP_X_FORWARDED_PROTO'].tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-22[ci skip] Add changelog entry for #4712Andrey Andreev1-0/+1
2016-07-22Fix #4712Andrey Andreev1-10/+23
2016-07-22[ci skip] Add affected_rows() to db reference docsAndrey Andreev1-0/+9
2016-07-22Fix #4713Andrey Andreev2-4/+10
2016-07-21Merge pull request #4716 from Ema4rl/patch-1Andrey Andreev1-2/+2
[ci skip] Fix Session userguide typos
2016-07-21Merge pull request #4716 from Ema4rl/patch-1Andrey Andreev1-2/+2
[ci skip] Fix Session userguide typos
2016-07-21Fixed typosHarrison Emmanuel1-2/+2
Changed umark_flash() and umark_temp() to unmark_flash() and unmark_temp() to match with their respective methods in the Session class.
2016-07-19Merge pull request #4705 from tianhe1986/develop_upload_raw_nameAndrey Andreev1-1/+1
Improve #4691
2016-07-19Merge pull request #4705 from tianhe1986/develop_upload_raw_nameAndrey Andreev1-1/+1
Improve #4691
2016-07-19Close #4692Andrey Andreev1-1/+1
2016-07-19Merge pull request #4697 from galdiolo/patch-15Andrey Andreev1-2/+2
[ci skip] recommend PHP >= 5.6
2016-07-19Fix #4695Andrey Andreev2-4/+3
2016-07-19[ci skip] Clarify lang() helper docsAndrey Andreev1-5/+8
As requested in #4693
2016-07-19[ci skip] Consistent changelog syntaxAndrey Andreev1-3/+3
2016-07-19Fix #4679Andrey Andreev3-2/+9
2016-07-19[ci skip] Fix an undefined index for 'timeout' in Redis session driverAndrey Andreev1-2/+3
http://forum.codeigniter.com/thread-64219.html
2016-07-15Merge pull request #1 from nopesled/nopesled-patch-1nopesled1-1/+1
Update path_helper.php
2016-07-11Use negative length for speeding up.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-07recommend PHP >= 5.6Claudio Galdiolo1-2/+2
PHP 5.5 end of life is July 10, 2016
2016-07-07Update path_helper.phpnopesled1-1/+1
2016-07-07Update path_helper.phpnopesled1-1/+1
Protect against RFI via php:// wrapper
2016-07-06[ci skip] Add a changelog entry for PR #4691Andrey Andreev1-0/+1
2016-07-06Merge pull request #4691 from chestnutprog/developAndrey Andreev1-1/+1
[ci skip] Fix a bug in CI_Upload::data()
2016-07-06Merge pull request #4691 from chestnutprog/developAndrey Andreev1-1/+1
[ci skip] Fix a bug in CI_Upload::data()
2016-07-06Update Upload.phpchestnutprog1-1/+1
特殊文件名可能会引起bug
2016-07-04[ci skip] Fix a changelog entry referenceAndrey Andreev1-1/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-14 21:13:20 +0100