summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
2016-08-11Cache_file: use $data['time'] for calculating expired time.tianhe19861-1/+1
2016-08-11Cache_file: use is_file() for checking instead of file_exists().tianhe19861-2/+2
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
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
2016-08-10Use getMockBuilder() in PHPUnit instead of the deprecated getMock()Andrey Andreev8-17/+17
2016-08-10Better usageVivek Dinesh2-2/+2
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
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
2016-08-10Merge pull request #4754 from tianhe1986/develop_fix_unit_test_nameAndrey Andreev1-1/+1
2016-08-09URI schemes are not case sensitiveVivek Dinesh2-2/+2
2016-08-09URI schemes are not case sensitiveVivek Dinesh1-1/+1
2016-08-09CI_Unit_test: Do not replace "is_double" with "is_float".tianhe19861-1/+0
2016-08-09CI_Unit_test: Fix name of visible test items.tianhe19861-1/+1
2016-08-01[ci skip] Fix #4739Andrey Andreev2-2/+3
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
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
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
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
2016-07-26Merge pull request #4709 from nopesled/developAndrey Andreev1-1/+1
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
2016-07-25Merge pull request #4724 from tianhe1986/develop_is_https_strtolowerAndrey Andreev1-1/+1
2016-07-25Merge pull request #4725 from tianhe1986/develop_url_encode_case_insensitiveAndrey Andreev2-2/+14
2016-07-25Merge pull request #4724 from tianhe1986/develop_is_https_strtolowerAndrey Andreev1-1/+1
2016-07-22Replace url_encoded invisible characters case-insensitively.tianhe19862-2/+14
2016-07-22Call strtolower before comparing $_SERVER['HTTP_X_FORWARDED_PROTO'].tianhe19861-1/+1
2016-07-22[ci skip] Add changelog entry for #4712Andrey Andreev1-0/+1