summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-01-10Merge branch '3.1-stable' into developAndrey Andreev14-72/+207
2017-01-10[ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1Andrey Andreev2-0/+14
2017-01-10Add a testcase and changelog entry for #4975Andrey Andreev2-2/+8
2017-01-10Merge pull request #4975 from cfaulkner/fix_ci_prepare_view_varsAndrey Andreev1-2/+2
2017-01-10Fix Undefined variable: object errorChris Faulkner1-2/+2
2017-01-09[ci skip] Mark the beginning of 3.1.4-devAndrey Andreev6-4/+26
2017-01-09[ci skip] Prepare 3.1.3 releaseAndrey Andreev4-5/+5
2017-01-09Merge branch 'security' into 3.1-stableAndrey Andreev5-43/+85
2017-01-06[ci skip] Add changelog entry for PR #4825Andrey Andreev1-1/+5
2017-01-06Merge pull request #4825 from gxgpet/developAndrey Andreev1-9/+3
2017-01-06[ci skip] Add a changelog entry for #4765Andrey Andreev1-0/+1
2017-01-06[ci skip] Don't set User-Agent header in CI_Email::clear()Andrey Andreev1-1/+0
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
2017-01-06[ci skip] Cosmetich changes to CI_Image_lib::get_image_properties()Andrey Andreev1-14/+15
2017-01-06[ci skip] Add a changelog entry for #4457Andrey Andreev1-0/+1
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
2017-01-06Fix FV's valid_mac() on PHP 5.4Andrey Andreev1-1/+1
2017-01-06[ci skip] Add changelog entry for PR #4251Andrey Andreev1-0/+1
2017-01-06[ci skip] A cosmetic change to the PR #4251Andrey Andreev1-2/+2
2017-01-06[ci skip] Merge pull request #4251 from dimitribalazs/patch-2Andrey Andreev1-2/+3
2017-01-06[ci skip] Correct FV docs on valid_ip accepting a paramAndrey Andreev1-1/+1
2017-01-06Add valid_mac() FV ruleAndrey Andreev5-2/+41
2017-01-06[ci skip] Add a changelog entry for #4963Andrey Andreev1-0/+1
2017-01-06[ci skip] Add a changelog entry for #4962Andrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
2017-01-06[ci skip] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
2017-01-05Address #4963Andrey Andreev1-7/+47
2017-01-05Address #4963Andrey Andreev1-7/+47
2017-01-05add empty line priorytetsuro1-1/+1
2017-01-05oci8_forge add column bug fixytetsuro1-1/+2
2017-01-05[ci skip] Merge pull request #4970 from arysom/developAndrey Andreev1-0/+15
2017-01-05[ci skip] Merge pull request #4970 from arysom/developAndrey Andreev1-0/+15
2017-01-05[ci skip] || -> ORAndrey Andreev1-1/+1
2017-01-04editorconfig settingsarysom1-0/+15
2017-01-04Close #4904Andrey Andreev4-9/+11
2017-01-04Fix a possible file inclusion vulnerability in CI_Loader::vars()Andrey Andreev2-30/+29
2017-01-04[ci skip] Try to mitigate BREACH attacks against CSRF tokensAndrey Andreev2-6/+36
2017-01-04[ci skip] Protect CSRF verification from timing side-channel attacksAndrey Andreev2-6/+9
2017-01-04Fix an XSS vulnerabilityAndrey Andreev3-1/+10
2017-01-03[ci skip] Correct changelog entry for issue #4804, againAndrey Andreev1-1/+1
2017-01-03[ci skip] Correct changelog entry for issue #4804Andrey Andreev1-1/+1
2017-01-03Fix #4804Andrey Andreev2-1/+2
2017-01-03[ci skip] Remove /tests/tests/ from .gitignoreAndrey Andreev1-1/+0
2017-01-03[ci skip] Add changelog entry for PR #4958Andrey Andreev1-0/+1
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1