Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-01-17 | Address #4980 | Andrey Andreev | 1 | -13/+14 | |
2017-01-17 | Add aliased tables cache. | tianhe1986 | 1 | -17/+23 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2017-01-16 | spelling fixes | klemens | 16 | -23/+23 | |
2017-01-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -2/+2 | |
Conflicts resolved: system/core/CodeIgniter.php 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/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst | |||||
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 | Fix #4804 | Andrey Andreev | 1 | -1/+1 | |
2017-01-03 | Merge pull request #4958 from boxsnake/develop | Andrey Andreev | 1 | -1/+1 | |
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby | |||||
2017-01-03 | Merge pull request #4958 from boxsnake/develop | Andrey Andreev | 1 | -1/+1 | |
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby | |||||
2017-01-03 | [ci skip] Fix 4953 | Andrey Andreev | 1 | -1/+1 | |
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 | 75 | -150/+150 | |
2016-12-31 | Update copyright data to 2017 | Master Yoda | 75 | -150/+150 | |
2016-12-23 | 1. Updated last comit with comment for ↵ | Alex Fang | 1 | -1/+1 | |
https://github.com/bcit-ci/CodeIgniter/pull/4955 | |||||
2016-12-22 | Fix bug: DB_query_builder do not add parenthesis for cached group_by | Alex Fang | 1 | -1/+1 | |
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 | 5 | -105/+27 | |
2016-12-12 | Fix #4892 - update_batch() | Andrey Andreev | 5 | -105/+27 | |
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-11-23 | [ci skip] Styling change after 21b7a2a2d00bd5645b2ca1afcfa4098e207292a4 | Andrey Andreev | 1 | -2/+2 | |
2016-11-22 | Add support for CURRENT_TIMESTAMP (and similar) defaults to date/time fields ↵ | Andrey Andreev | 1 | -12/+24 | |
in DB Forge As requested in #4852 | |||||
2016-10-31 | Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quote | Andrey Andreev | 2 | -2/+2 | |
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 | 2 | -2/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-31 | Merge pull request #4886 from tianhe1986/develop_dbdriver_quote | Andrey Andreev | 2 | -2/+2 | |
Detect double-quoted strings in DB::compile_binds() | |||||
2016-10-31 | Merge pull request #4886 from tianhe1986/develop_dbdriver_quote | Andrey Andreev | 2 | -2/+2 | |
Detect double-quoted strings in DB::compile_binds() | |||||
2016-10-28 | Revert "Match single quote in is_write_type()." | tianhe1986 | 1 | -1/+1 | |
This reverts commit eef5951ae313c2c4080e94b8c1aa743a6d6c93b7. Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-28 | Merge branch '3.1-stable' into develop | Andrey Andreev | 15 | -19/+103 | |
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 single quote in is_write_type(). | tianhe1986 | 1 | -1/+1 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-28 | Match both single and double quote in compile_binds(). | tianhe1986 | 2 | -2/+2 | |
Signed-off-by: tianhe1986 <w1s2j3229@163.com> | |||||
2016-10-28 | Fix #4884 | Andrey Andreev | 1 | -1/+1 | |
2016-10-27 | Fix #4871 | Andrey Andreev | 1 | -3/+5 | |
2016-10-22 | Allow binding 0, null out of array in query() | Andrey Andreev | 1 | -1/+1 | |
2016-10-17 | Fix #4851 | Andrey Andreev | 6 | -10/+10 | |
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 | 4 | -21/+8 | |
2016-08-01 | Merge pull request #4742 from masterklavi/db_fetch_object | Andrey Andreev | 1 | -1/+1 | |
Change ... for the sake of change | |||||
2016-07-31 | Changed the return value of CI_DB_result::_fetch_object(..) to object | Masterklavi | 1 | -1/+1 | |
2016-07-29 | Fix #4737 | Andrey Andreev | 1 | -2/+2 | |
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 | 19 | -140/+182 | |
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 | |