Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-03-24 | Merge branch '3.1-stable' into develop | Andrey Andreev | 11 | -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-20 | Fix #5057 | Andrey Andreev | 1 | -2/+2 | |
2017-03-14 | Fix #5050 | Andrey Andreev | 10 | -11/+11 | |
2017-01-17 | [ci skip] Merge pull request #4986 from ka7/feature/spelling | Andrey Andreev | 14 | -20/+20 | |
Spelling fixes in comment blocks and docs | |||||
2017-01-16 | spelling fixes | klemens | 14 | -20/+20 | |
2017-01-06 | [ci skip] Add an empty line to PR #4962 patch | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Add an empty line to PR #4962 patch | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Merge pull request #4962 from ytetsuro/patch-2 | Andrey Andreev | 1 | -1/+2 | |
oci8_forge add column bug fix | |||||
2017-01-05 | add empty line prior | ytetsuro | 1 | -1/+1 | |
add empty line prior | |||||
2017-01-05 | oci8_forge add column bug fix | ytetsuro | 1 | -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 Andreev | 4 | -8/+8 | |
from develop | |||||
2017-01-03 | Update copyright data to 2017 | Master Yoda | 68 | -136/+136 | |
2016-12-31 | Update copyright data to 2017 | Master Yoda | 68 | -136/+136 | |
2016-12-14 | Drop all PHP 5.3-related code | Andrey Andreev | 6 | -772/+1 | |
2016-12-14 | Merge branch '3.1-stable' into develop | Andrey Andreev | 4 | -95/+8 | |
2016-12-12 | Fix #4892 - update_batch() | Andrey Andreev | 4 | -95/+8 | |
Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871 Supersedes #4929 | |||||
2016-12-12 | Merge pull request #4941 from aquilax/fix-pdo-sqlite-order_by-rand | Andrey Andreev | 1 | -1/+1 | |
Fix order_by() random for pdo/sqlite driver | |||||
2016-12-10 | `_random_keyword` must be array | aquilax | 1 | -1/+1 | |
Signed-off-by: aquilax <aquilax@gmail.com> | |||||
2016-10-31 | Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quote | Andrey Andreev | 1 | -1/+1 | |
Fix compile_binds: do not use back references inside a character class. | |||||
2016-10-31 | Fix compile_binds: do not use back references inside a character class. | tianhe1986 | 1 | -1/+1 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-31 | Merge pull request #4886 from tianhe1986/develop_dbdriver_quote | Andrey Andreev | 1 | -1/+1 | |
Detect double-quoted strings in DB::compile_binds() | |||||
2016-10-31 | Merge pull request #4886 from tianhe1986/develop_dbdriver_quote | Andrey Andreev | 1 | -1/+1 | |
Detect double-quoted strings in DB::compile_binds() | |||||
2016-10-28 | Merge branch '3.1-stable' into develop | Andrey Andreev | 12 | -12/+94 | |
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-28 | Match both single and double quote in compile_binds(). | tianhe1986 | 1 | -1/+1 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-17 | Fix #4851 | Andrey Andreev | 5 | -8/+8 | |
2016-09-27 | Fix #4809 | Andrey Andreev | 1 | -0/+49 | |
2016-09-16 | [ci skip] Don't try to insert_batch() when we know it's not supported on ↵ | Andrey Andreev | 2 | -0/+33 | |
Firebird | |||||
2016-09-16 | [ci skip] Fix #4808 | Andrey Andreev | 4 | -4/+4 | |
2016-09-09 | Merge pull request #4805 from intekhabrizvi/develop | Andrey Andreev | 1 | -1/+1 | |
Use MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT as a connection flag instead of option | |||||
2016-09-09 | Removed mysqli options function for ssl certificate verification false | intekhab | 1 | -1/+0 | |
2016-09-09 | supplied flag to turn off mysqli SSL verification if ssl_verify passed as false | intekhab | 1 | -0/+1 | |
2016-08-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -19/+6 | |
2016-07-28 | Remove dead code written for PHP 5.2 | Andrey Andreev | 3 | -19/+6 | |
2016-07-26 | Merge branch '3.1-stable' into develop | Andrey Andreev | 18 | -135/+172 | |
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst | |||||
2016-07-26 | Fix SQLi in ODBC drivers | Andrey Andreev | 2 | -124/+118 | |
2016-06-28 | [ci skip] Add changelog entries for PR #4678 | Andrey Andreev | 2 | -2/+0 | |
2016-06-28 | Merge pull request #4678 from kenjis/fix-oci8_forge | Andrey Andreev | 2 | -4/+69 | |
DBForge adjustments for Oracle | |||||
2016-06-28 | Remove duplicated $_create_table_if | kenjis | 1 | -7/+0 | |
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com> | |||||
2016-06-27 | Fix oci8_forge | kenjis | 2 | -0/+72 | |
* Oracle does not have `create table if exists` * Oracle has only NUMBER for integer Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com> | |||||
2016-06-22 | Fix #4674 | Andrey Andreev | 2 | -2/+10 | |
2016-06-08 | Make db_select() clear cached database metadata | Andrey Andreev | 5 | -0/+5 | |
2016-05-25 | [ci skip] Add 'LONGTEXT' to 'STRING' alias to CUBRID drivers for DBForge | Andrey Andreev | 2 | -0/+6 | |
Requested in #4640 | |||||
2016-05-25 | Amend fix for #4637 | Andrey Andreev | 1 | -1/+1 | |
2016-05-19 | [ci skip] Fix #4637 | Andrey Andreev | 1 | -7/+13 | |
2016-04-01 | [ci skip] Fix #861 (regression) | Andrey Andreev | 4 | -0/+20 | |
2016-03-11 | Merge branch '3.0-stable' into develop | Andrey Andreev | 1 | -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 | |||||
2016-03-07 | [ci skip] Fix transactions for the ibase driver | Andrey Andreev | 1 | -1/+1 | |
Reported via the forums: http://forum.codeigniter.com/thread-64559.html | |||||
2016-01-11 | [ci skip] Merge branch '3.0-stable' into develop | Andrey Andreev | 72 | -72/+72 | |
2016-01-11 | [ci skip] Update ellislab.com links to https too | Andrey Andreev | 72 | -72/+72 | |
2016-01-11 | Merge branch '3.0-stable' into develop | Andrey Andreev | 72 | -144/+144 | |