summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-08-29Merge pull request #4785 from guitarrist/developAndrey Andreev1-1/+1
2016-08-26fix typoAntônio1-1/+1
2016-08-23Merge pull request #4781 from tianhe1986/develop_hash_pbkdf2Andrey Andreev1-1/+1
2016-08-23Move strtolower() inside the is_array() check,tianhe19861-2/+1
2016-08-23Hash: processing algorithm name case-insensitively in hash_pbkdf2():tianhe19861-0/+1
2016-08-22Merge pull request #4780 from tianhe1986/develop_standard_hex2binAndrey Andreev1-1/+1
2016-08-22Standard: filtering "resource" type in hex2bin()tianhe19861-1/+1
2016-08-22Merge branch '3.1-stable' into developAndrey Andreev4-5/+38
2016-08-22Skip mcrypt-related testcases on PHP 7.1Andrey Andreev2-2/+14
2016-08-22Fix CI_Upload errors on PHP 7.1Andrey Andreev2-3/+21
2016-08-22Merge pull request #4778 from antydemant/patch-1Andrey Andreev1-2/+2
2016-08-22Merge pull request #4778 from antydemant/patch-1Andrey Andreev1-2/+2
2016-08-21return fixIgor Ostapchuk1-2/+2
2016-08-19Travis builds on PHP 7.1 (beta)Andrey Andreev1-2/+6
2016-08-19Travis builds on PHP 7.1 (beta)Andrey Andreev1-6/+6
2016-08-19[ci skip] Add changelog entry for PR #4777Andrey Andreev1-0/+2
2016-08-19Merge pull request #4777 from tianhe1986/develop_error_handlerAndrey Andreev1-1/+1
2016-08-19Merge pull request #4777 from tianhe1986/develop_error_handlerAndrey Andreev1-1/+1
2016-08-19Common: Adding E_PARSE in error judgment.tianhe19861-1/+1
2016-08-11Merge pull request #4764 from butane/uri_scheme_caseAndrey Andreev3-9/+4
2016-08-11Removed useless checksVivek Dinesh2-7/+2
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
2016-08-11Merge pull request #4762 from tianhe1986/develop_cache_file_metadataAndrey Andreev1-2/+2
2016-08-11Using "! isset($a, $b, ……)" instead of "! isset($a) OR ! isset($b) OR …...tianhe19861-1/+1
2016-08-11URI schemes are not case-sensitiveVivek Dinesh3-5/+5
2016-08-11Checking for $data['time'].tianhe19861-1/+1
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
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