summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
Fix CI_Email not sending User-Agent header
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
Fix CI_Image_lib::get_image_properties() invalid image handling
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
Added alt attribute functionality to captcha helper
2017-01-06Add valid_mac() FV ruleAndrey Andreev5-2/+41
Close #3992
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-05add empty line priorytetsuro1-1/+1
add empty line prior
2017-01-05oci8_forge add column bug fixytetsuro1-1/+2
Notice Error Array to string conversion $this->dbforge->add_column('sample', [ 'column_name1' => [ 'type' => 'char', 'default' => '0' ], 'column_name2' => [ 'type' => 'char', 'default' => '0' ] ]);
2017-01-05[ci skip] Merge pull request #4970 from arysom/developAndrey Andreev1-0/+15
Add .editorconfig
2017-01-05[ci skip] || -> ORAndrey Andreev1-1/+1
2017-01-04editorconfig settingsarysom1-0/+15
2017-01-04Close #4904Andrey Andreev4-9/+11
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] Update year to 2017 in user_guide_src/cilexerAndrey Andreev1-3/+3
2016-12-31Update copyright data to 2017Master Yoda167-330/+331
2016-12-231. Updated last comit with comment for ↵Alex Fang1-1/+1
https://github.com/bcit-ci/CodeIgniter/pull/4955
2016-12-22Fix bug: DB_query_builder do not add parenthesis for cached group_byAlex Fang1-1/+1
2016-12-16[ci skip] Remove a function_exists() call from CI_Image_libAndrey Andreev1-1/+1
We use this function elsewhere without checking for existence; nobody has complained
2016-12-16Merge pull request #4947 from slax0rr/developAndrey Andreev2-6/+3
[ci skip] Remove needless constructor in model general topics documentation
2016-12-16Add constructor comments to match controller docsTomaz Lovrec2-0/+3
Empty constructors are pointless and bad practice, but removing them from this part of the documentation makes it less readable, makes less of a point, and would be quite frankly weird. Added a comment that suggests that further user code should be put there, like it is in the controller documentation
2016-12-16Remove needless constructor in model documentationTomaz Lovrec1-6/+0
PHP will execute the parent constructor regardless if a constructor method is defined in the child class or not. Defining an empty constructor just to call the parents constructor can be considered bad practice.
2016-12-16Merge pull request #4945 from vlakoff/text_helperAndrey Andreev1-1/+1
Small code simplification in character_limiter()
2016-12-15Small code simplification in character_limiter()vlakoff1-1/+1
2016-12-14Move csrf_verify() call out of CI_InputAndrey Andreev11-82/+41
2016-12-14Isolate CI_Security instantiation from CI_Input; improve testsAndrey Andreev13-83/+79
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev30-1115/+28
2016-12-14[ci skip] More doc changes related to PHP 5.4.8 requirementAndrey Andreev6-20/+30
2016-12-14[ci skip] Require PHP 5.4.8 as the absolute minimumAndrey Andreev2-1/+5
We stopped testing this branch on 5.3 long ago
2016-12-14Don't allow failures with PHP 7.1 on Travis-CIAndrey Andreev1-1/+0
2016-12-14[ci skip] Update changelog; add an entry & upgrade instructions for last commitAndrey Andreev3-20/+52
2016-12-14Remove dead parameter from form_upload()Andrey Andreev1-2/+1
Close #3558
2016-12-14Finally drop CI_Input::_sanitize_globals()Andrey Andreev4-201/+32
Close #4101
2016-12-14Remove 'global_xss_filtering' config settingAndrey Andreev6-69/+20
2016-12-14Remove 'allow_get_array', 'standardize_newlines' config settingsAndrey Andreev5-56/+8
2016-12-14[ci skip] Fix a changelog entry typoAndrey Andreev1-1/+1
2016-12-14Merge branch '3.1-stable' into developAndrey Andreev10-130/+78
2016-12-14[ci skip] Deprecate 'allow_get_array', 'standardize_newlines'Andrey Andreev3-6/+32
2016-12-14Move 'standardize_newlines' proc out of CI_Input::_clean_input_data()Andrey Andreev1-17/+7
Preparation for CI_Input::_sanitize_globals() removal. Also, WTF?! I'm deprecating this functionality in 3.1.next.
2016-12-12Remove previously deprecated Cart LibraryAndrey Andreev6-983/+17
2016-12-12Remove previously deprecated Smiley HelperAndrey Andreev7-499/+14
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-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-10`_random_keyword` must be arrayaquilax1-1/+1
Signed-off-by: aquilax <aquilax@gmail.com>
2016-12-09[ci skip] Fix #4937Andrey Andreev2-13/+7