summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-11Merge pull request #4764 from butane/uri_scheme_caseAndrey Andreev3-9/+4
URI schemes are not case-sensitive
2016-08-11Removed useless checksVivek Dinesh2-7/+2
Based on GitHub discussion. Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-11[ci skip] Add changelog entry for #4762Andrey Andreev1-0/+1
2016-08-11Merge pull request #4762 from tianhe1986/develop_cache_file_metadataAndrey Andreev1-2/+2
Cache_file: use $data['time'] for calculating expired time.
2016-08-11Merge pull request #4762 from tianhe1986/develop_cache_file_metadataAndrey Andreev1-2/+2
Cache_file: use $data['time'] for calculating expired time.
2016-08-11Using "! isset($a, $b, ……)" instead of "! isset($a) OR ! isset($b) OR ↵tianhe19861-1/+1
……" Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11URI schemes are not case-sensitiveVivek Dinesh3-5/+5
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-11Checking for $data['time'].tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
Cache_file: use is_file() for checking instead of file_exists().
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
Cache_file: use is_file() for checking instead of file_exists().
2016-08-11Cache_file: use $data['time'] for calculating expired time.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11Cache_file: use is_file() for checking instead of file_exists().tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev36-678/+88
2016-08-10Add changelog entry and a test case for #4758Andrey Andreev2-0/+4
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Use getMockBuilder() in PHPUnit instead of the deprecated getMock()Andrey Andreev8-17/+17
2016-08-10Better usageVivek Dinesh2-2/+2
Based on GitHub discussion. Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".
2016-08-10[ci skip] Add changelog entry for #4754Andrey Andreev1-0/+1
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-10Merge pull request #4754 from tianhe1986/develop_fix_unit_test_nameAndrey Andreev1-1/+1
CI_Unit_test: Fix translation of result datatype
2016-08-09URI schemes are not case sensitiveVivek Dinesh2-2/+2
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-09URI schemes are not case sensitiveVivek Dinesh1-1/+1
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-09CI_Unit_test: Do not replace "is_double" with "is_float".tianhe19861-1/+0
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-09CI_Unit_test: Fix name of visible test items.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-01[ci skip] Fix #4739Andrey Andreev2-2/+3
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
Change ... for the sake of change
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-29Fix #4737Andrey Andreev2-2/+3
2016-07-29[ci skip] Fix #4736Andrey Andreev2-1/+2
2016-07-28[ci skip] Use const keyword to define CI_VERSIONAndrey Andreev1-1/+1
Because.
2016-07-28Remove dead code written for PHP 5.2Andrey Andreev25-649/+55
2016-07-28[ci skip] Fix #3919, #4732Andrey Andreev2-7/+3
2016-07-26Fix Travis buildsAndrey Andreev1-3/+0
2016-07-26Fix Travis buildsAndrey Andreev1-0/+1
2016-07-26Add 3.1-stable to tested branches listAndrey Andreev1-0/+1
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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-03 03:26:29 +0100