summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-01-11[ci skip] Add a changelog entry for 37226c036a52ae857b13109774b1cdfc4b1d4db9Andrey Andreev1-0/+1
2017-01-11Merge branch 'feature/sess_db_destroy' into 3.1-stableAndrey Andreev1-5/+5
2017-01-11[ci skip] Add changelog entry for #4977Andrey Andreev1-0/+1
2017-01-11[ci skip] Merge pull request #4977 from ↵Andrey Andreev1-1/+1
fabiospampinato/fabiospampinato-loader-helper-regex-fix Fixed regex used for loading helpers
2017-01-11[ci skip] Fix an error with DB sessions triggered with regenerate + destroyAndrey Andreev1-5/+5
2017-01-10Disallow Travis failures for PHP 7.1Andrey Andreev1-1/+0
2017-01-10[ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1Andrey Andreev2-0/+14
See #4967
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
Fix an Undefined variable: object error in CI_Loader
2017-01-10Fix Undefined variable: object errorChris Faulkner1-2/+2
Change the undefined variable $object to $vars when calling get_object_vars(). This fixes an error when passing an object to a view.
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 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
Ref: #4765
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
Fix CI_Email not sending User-Agent header
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
Fix CI_Image_lib::get_image_properties() invalid image handling
2017-01-06[ci skip] Correct FV docs on valid_ip accepting a paramAndrey Andreev1-1/+1
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] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
oci8_forge add column bug fix
2017-01-05Address #4963Andrey Andreev1-7/+47
Would supersede PR #4966
2017-01-05Address #4963Andrey Andreev1-7/+47
Would supersede PR #4966
2017-01-05[ci skip] Merge pull request #4970 from arysom/developAndrey Andreev1-0/+15
Add .editorconfig
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
It got there by accident
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
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby
2017-01-03[ci skip] Fix 4953Andrey Andreev2-1/+2
2017-01-03[ci skip] Update year number in remaining files that were recently deleted ↵Andrey Andreev10-20/+20
from develop
2017-01-03[ci skip] Update year to 2017 in user_guide_src/cilexerAndrey Andreev1-3/+3
2017-01-03Update copyright data to 2017Master Yoda167-330/+331
2016-12-16Merge pull request #4945 from vlakoff/text_helperAndrey Andreev1-1/+1
Small code simplification in character_limiter()
2016-12-16Merge pull request #4947 from slax0rr/developAndrey Andreev2-6/+3
[ci skip] Remove needless constructor in model general topics documentation
2016-12-14[ci skip] Fix a changelog entry typoAndrey Andreev1-1/+1
2016-12-14[ci skip] Deprecate 'allow_get_array', 'standardize_newlines'Andrey Andreev3-6/+32
2016-12-12Fix #4892 - update_batch()Andrey Andreev6-105/+28
Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871 Supersedes #4929
2016-12-12Really fix #4937Andrey Andreev1-6/+6
2016-12-12[ci skip] Add changelog entry for PR #4941Andrey Andreev1-0/+1
2016-12-12Merge pull request #4941 from aquilax/fix-pdo-sqlite-order_by-randAndrey Andreev1-1/+1
Fix order_by() random for pdo/sqlite driver
2016-12-09[ci skip] Fix #4937Andrey Andreev2-13/+7