summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2015-07-16Add SSL support for PDO_MYSQL tooAndrey Andreev1-2/+29
Related: #3896
2015-07-16Improve the ssl_cipher check for MySQLiAndrey Andreev1-9/+9
Related: #3896
2015-07-16Refactor proposed changes from PR #3896Andrey Andreev1-44/+28
2015-07-16Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into ↵Andrey Andreev1-2/+56
feature/mysqli_ssl
2015-07-15[ci skip] Revert styleguide violations from PR #3828Andrey Andreev1-3/+3
2015-07-15Merge branch 'patch-1' of github.com:w0den/CodeIgniter into feature/output_cacheAndrey Andreev1-7/+28
2015-07-15Merge pull request #3715 from infinit89/patch-1Andrey Andreev1-1/+1
[ci skip] Fix pagination links with protocol-relative URLs
2015-07-15Merge pull request #3977 from MSDehghan/developAndrey Andreev1-1/+1
[ci skip] Fix a log message typo
2015-07-15Polish changes from PR #3893Andrey Andreev1-24/+13
2015-07-15Fix a TypoMohammad Sadegh Dehghan Niri1-1/+1
2015-07-15Merge branch 'feature/form_helper' of github.com:darkhouse/CodeIgniter into ↵Andrey Andreev1-10/+28
feature/form_helpers_extra_array Manually fixed conflicts in: user_guide_src/source/changelog.rst
2015-07-15allow add of keys with arrayAdrian Voicu1-1/+1
This will allow adding multiple keys using array (http://www.codeigniter.com/user_guide/database/forge.html#adding-keys). Only if user wants, he can use the table columns to set a primary key by setting second parameter as TRUE.
2015-07-13Add check for PCRE UTF-8 supportdimonneon1-1/+1
2015-07-10Add unicode support in url_title functiondimonneon1-2/+2
2015-07-09Fix #3965Andrey Andreev1-9/+3
2015-07-08[ci skip] Cleanup some whitespace in CI_Unit_testAndrey Andreev1-23/+23
2015-07-08Fix #3963Andrey Andreev1-3/+5
2015-07-06Merge pull request #3958 from ftwbzhao/feature/routerAndrey Andreev1-1/+1
[ci skip] Fix a comment typo
2015-07-06fix typo in router classftwbzhao1-1/+1
2015-07-06Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developftwbzhao2-3/+3
Conflicts: user_guide_src/source/changelog.rst
2015-07-06Merge pull request #3955 from ftwbzhao/ci3.0Andrey Andreev1-2/+2
key_prefix support for Cache increment() and decrement()
2015-07-06Added "is_resource" into the list of unit tests capable of being run.ftwbzhao1-1/+1
2015-07-05supported key_prefix on `increment` and `decrement`ftwbzhao1-2/+2
2015-07-05fix pdo/sqlite & update changelogftwbzhao1-1/+1
2015-07-04fix SQlite3 list_fieldsftwbzhao1-1/+1
2015-07-02Fix QB delete() for multiple tables with where()Andrey Andreev1-0/+3
Reported via the forums: http://forum.codeigniter.com/thread-61774.html
2015-07-02Close #3941Andrey Andreev1-6/+1
2015-07-02Apply PR #3940 to sqlite3 driver and fix a wrong var nameAndrey Andreev1-1/+2
2015-07-02sqlite < 3.3 unsuported `_drop_table_if`ftwbzhao1-0/+1
2015-06-29Close #3934Andrey Andreev1-1/+1
2015-06-29Fix regression caused by 59d1ffd927ef3b63dbadf42e1caf14957201fd2dAndrey Andreev1-1/+1
2015-06-29Fix #3932Andrey Andreev1-1/+1
2015-06-22A small optimization in CI_Cache::is_supported()Andrey Andreev1-3/+2
As it was, the static variable was always re-set to an empty array
2015-06-22Fix #3913Andrey Andreev2-139/+128
2015-06-22Work-around for https://bugs.php.net/bug.php?id=39598Andrey Andreev2-2/+42
Fixes #3922
2015-06-22Alter CI_Upload logging levelsAndrey Andreev1-23/+22
Close #3920
2015-06-18Removed db_options configuration item for implementation later. Changed 5 ↵Tim Nolte1-60/+16
new MySQLi SSL configuration options to a single ssl_options config item that is an array that will be read to set the individual SSL options. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-06-18Merge branch 'develop' into feature/mysqli-sslTim Nolte2-4/+9
2015-06-17removed unnecessary change to form_radio, updated docs and added changelog entryAdam Jackett1-2/+0
2015-06-15Fix #3908Andrey Andreev1-1/+1
2015-06-13Fix typo in url_title function description.Michael Foss1-1/+1
2015-06-11Fix #3904Andrey Andreev1-0/+6
2015-06-10Fix #3903Andrey Andreev1-3/+2
2015-06-08Merge branch 'develop' into feature/mysqli-sslTim Nolte16-74/+96
2015-06-08Fixed missing MySQLi driver parameter DOCBLOCK descriptions. Updated ↵Tim Nolte1-0/+10
database configuration documentation to include a list of the new MySQLi driver parameters. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-06-08Fix #3890Andrey Andreev1-5/+13
2015-06-05Updated the MySQLi driver to provide support for SSL connections as well as ↵Tim Nolte1-2/+90
additional database connection options. Uses the DB_driver class encrypt option as the flag for turning on encryption. Also added SSL connection validation with error logging in order to provide users a way to know if they are actually connecting via SSL. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-06-03made all form helpers consistent regarding extra attributesAdam Jackett1-10/+30
2015-05-22Merge pull request #3868 from ftwbzhao/feature/migrationAndrey Andreev1-3/+3
[ci skip] Update Migration lib class reference docs
2015-05-21update function latestftwbzhao1-1/+1