summaryrefslogtreecommitdiffstats
path: root/system/database/drivers
AgeCommit message (Collapse)AuthorFilesLines
2019-09-25Fix indentsapics5-9/+9
2019-09-19Merge branch '3.1-stable' into developAndrey Andreev5-5/+5
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Session/drivers/Session_redis_driver.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
2019-07-16Fix #5796Andrey Andreev3-3/+3
2019-07-15[ci skip] Fix #5788Andrey Andreev1-1/+1
2019-02-26[ci skip] Fix #5701Andrey Andreev1-1/+1
2019-02-14Merge branch '3.1-stable' into developAndrey Andreev5-8/+15
2019-02-14[ci skip] Polish changes from PR #5692, apply them to pdo/oci and add a ↵Andrey Andreev2-5/+12
changelog entry
2019-02-14[ci skip] Merge pull request #5692 from ytetsuro/patch-2Andrey Andreev1-0/+7
Fixed bug that can not be changed from not null to null in oci.
2019-02-12feat: add _null propertyytetsuro1-0/+7
2019-01-25[ci skip] Fix #5681Andrey Andreev3-3/+3
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev6-36/+31
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, BCIT72-212/+212
Update copyright date to 2019
2018-12-27Update copyright date to 2019Jim Parry68-136/+136
2018-11-16[ci skip] Fix #5624Andrey Andreev2-18/+6
2018-08-22[ci skip] Close #5513Andrey Andreev1-0/+5
2018-08-22[ci skip] Fix #5561Andrey Andreev1-16/+18
2018-07-22[ci skip] Fix #5542Andrey Andreev2-2/+2
2018-05-18http:// to https://Mehdi Bounya68-136/+136
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev2-5/+17
Conflicts resolved: system/core/CodeIgniter.php system/core/Security.php system/database/DB_query_builder.php system/libraries/Email.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
2018-03-15[ci skip] Fix #5435Andrey Andreev1-1/+14
2018-02-28[ci skip] Fix 5423Andrey Andreev1-4/+3
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev72-144/+144
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09Annual copyright updateMaster Yoda68-136/+136
2017-10-16Merge branch '3.1-stable' into developAndrey Andreev2-16/+4
2017-09-27Fix #5276Andrey Andreev2-16/+4
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev6-9/+65
2017-09-13Fix #5260Andrey Andreev2-5/+61
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
Fix for DBLIB subdriver to get the right version number of SQL Server.
2017-08-31Refactoring some codeblocks.Andrei Rosseti1-26/+15
2017-08-30Fixed DBLIB subdriver to get the right version number of SQL Server.Andrei Rosseti1-0/+27
2017-08-25[ci skip] Fix #5236Andrey Andreev4-4/+4
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.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
2017-06-13[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entryAndrey Andreev1-1/+1
2017-06-13[ci skip] Merge pull request #5150 from ↵Andrey Andreev1-1/+1
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns
2017-06-13add rename to keywordytetsuro1-1/+1
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev1-1/+1
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre1-1/+1
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev11-13/+13
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_test.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/input.rst
2017-03-20Fix #5057Andrey Andreev1-2/+2
2017-03-14Fix #5050Andrey Andreev10-11/+11
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev14-20/+20
Spelling fixes in comment blocks and docs
2017-01-16spelling fixesklemens14-20/+20
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
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-03[ci skip] Update year number in remaining files that were recently deleted ↵Andrey Andreev4-8/+8
from develop
2017-01-03Update copyright data to 2017Master Yoda68-136/+136
2016-12-31Update copyright data to 2017Master Yoda68-136/+136