summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
AgeCommit message (Collapse)AuthorFilesLines
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev1-10/+4
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
2019-01-02Merge pull request #5662 from jim-parry/copyright2019Instructor, BCIT1-3/+3
Update copyright date to 2019
2018-12-27Update copyright date to 2019Jim Parry1-2/+2
2018-11-16[ci skip] Fix #5627Andrey Andreev1-1/+1
2018-11-16[ci skip] Fix #5624Andrey Andreev1-9/+3
2018-05-18http:// to https://Mehdi Bounya1-2/+2
2018-04-23[ci skip] Merge pull request #5471 from toonitw/patch-1Andrey Andreev1-1/+1
The value of limit can be zero
2018-04-18Remove the extra parenthesesJehong Ahn1-1/+1
2018-04-12qb_limit can be zeroJehong Ahn1-1/+1
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev1-2/+2
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09Annual copyright updateMaster Yoda1-2/+2
2017-10-16Merge branch '3.1-stable' into developAndrey Andreev1-4/+8
2017-10-13Fix #5297Andrey Andreev1-4/+8
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev1-0/+1
2017-09-04Fix #5246Andrey Andreev1-0/+1
2017-07-14[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_typeAndrey Andreev1-1/+1
add is_write_type method for merge query
2017-07-13add is_write_type method for merge queryytetsuro1-1/+1
Signed-off-by: tetsuro yoshikawa <phper.0o0@gmail.com>
2017-06-22Close #4134: Allow dots in alias names detected by QBAndrey Andreev1-10/+13
2017-02-20Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-16Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev1-1/+1
Spelling fixes in comment blocks and docs
2017-01-16spelling fixesklemens1-1/+1
2017-01-03Update copyright data to 2017Master Yoda1-2/+2
2016-12-31Update copyright data to 2017Master Yoda1-2/+2
2016-10-31Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quoteAndrey Andreev1-1/+1
Fix compile_binds: do not use back references inside a character class.
2016-10-31Fix compile_binds: do not use back references inside a character class.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev1-1/+1
Detect double-quoted strings in DB::compile_binds()
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev1-1/+1
Detect double-quoted strings in DB::compile_binds()
2016-10-28Revert "Match single quote in is_write_type()."tianhe19861-1/+1
This reverts commit eef5951ae313c2c4080e94b8c1aa743a6d6c93b7. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
Resolved conflicts: system/core/CodeIgniter.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst user_guide_src/source/libraries/form_validation.rst
2016-10-28Match single quote in is_write_type().tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Match both single and double quote in compile_binds().tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-22Allow binding 0, null out of array in query()Andrey Andreev1-1/+1
2016-02-09Merge branch '3.0-stable' into developAndrey Andreev1-4/+4
Fixed conflicts: user_guide_src/source/overview/at_a_glance.rst
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-01-27Fix #4401Andrey Andreev1-4/+4
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev1-1/+1
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev1-1/+1
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev1-2/+2
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev1-2/+2
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev1-2/+2
2016-01-11[ci skip] Bump year to 2016Andrey Andreev1-2/+2
2016-01-11Merge pull request #4369 from galdiolo/patch-12Andrey Andreev1-10/+6
Optimize transactions check in CI_DB_driver::query()
2016-01-08use 'while' instead of 'if' 'do' 'while'Claudio Galdiolo1-10/+6
2015-12-14Change DB charset handlingAndrey Andreev1-30/+2
Close #4311
2015-12-14Merge branch '3.0-stable' into developAndrey Andreev1-0/+12
2015-12-14Close #4313Andrey Andreev1-0/+12
2015-12-12Complete the proposed changes from PR #4300Andrey Andreev1-16/+3
2015-12-12Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exceptionAndrey Andreev1-1/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-02 18:34:51 +0100