summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-20Fix indentationkenjis1-4/+4
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-20[ci skip] Add a changelog entry for last commitAndrey Andreev1-0/+1
2015-07-20Fix an internal bug in QB where() escapingAndrey Andreev1-4/+1
This is not a supported use case, but if QB escaping is force-disabled, string values passed to where() or having() aren't escaped. That's wrong because escape-disabling should only be possible for identifiers and not values. Reported via the forums: http://forum.codeigniter.com/thread-62478.html
2015-07-20[ci skip] Fix #3985Andrey Andreev1-1/+1
2015-07-18Fix errors/cli/error_php.php outputkenjis1-13/+11
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-17Fix #3752Andrey Andreev2-21/+23
2015-07-17[ci skip] Fix #3778Andrey Andreev2-15/+7
2015-07-17[ci skip] Fix a bug reported via PR #3704Andrey Andreev2-23/+21
2015-07-17Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-2/+2
2015-07-17Merge pull request #3980 from kenjis/patch-2Andrey Andreev1-2/+2
[ci skip] Fix sample code
2015-07-17Fix sample codekenjis1-2/+2
2015-07-16Add 'ssl_verify' option for mysqli driverAndrey Andreev3-0/+7
MYSQLI_OPT_SSL_VERIFY_SERVER_CERT is an undocumented option that may not always be available. Reference: http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt?view=markup&pathrev=302897
2015-07-16[ci skip] Update DB configuration docs with new SSL optionsAndrey Andreev1-10/+15
2015-07-16Add SSL support for PDO_MYSQL tooAndrey Andreev3-4/+31
Related: #3896
2015-07-16Improve the ssl_cipher check for MySQLiAndrey Andreev1-9/+9
Related: #3896
2015-07-16[ci skip] Add note about colon-separated ssl_cipher listAndrey Andreev1-1/+1
2015-07-16Refactor proposed changes from PR #3896Andrey Andreev3-45/+39
2015-07-16Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into ↵Andrey Andreev3-5/+67
feature/mysqli_ssl
2015-07-16[ci skip] Fix #3869Andrey Andreev2-1/+8
Close #3978 Close #3979
2015-07-15[ci skip] Add changelog entries for PR #3828Andrey Andreev2-2/+14
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-15[ci skip] Add a changelog entry for PR #3715Andrey Andreev1-0/+1
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 Andreev3-39/+31
2015-07-15Fix a TypoMohammad Sadegh Dehghan Niri1-1/+1
2015-07-15Merge branch 'feature/form_helper' of github.com:darkhouse/CodeIgniter into ↵Andrey Andreev3-22/+56
feature/form_helpers_extra_array Manually fixed conflicts in: user_guide_src/source/changelog.rst
2015-07-15[ci skip] Add changelog entry for PR #3968Andrey Andreev1-0/+1
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-15Merge pull request #3969 from avenirer/patch-2Andrey Andreev1-0/+2
[ci skip] Add docs note about DB_forge::add_field() with raw strings
2015-07-15Merge branch 'feature/unicode_url_title' into developAndrey Andreev2-2/+5
2015-07-15[ci skip] Changelog entry for PR #3970Andrey Andreev1-0/+3
2015-07-13Update forge.rstAdrian Voicu1-1/+1
2015-07-13Add check for PCRE UTF-8 supportdimonneon1-1/+1
2015-07-13Update forge.rstAdrian Voicu1-1/+1
2015-07-13[ci skip] Update 'ico' entry in config/mimes.phpAndrey Andreev1-1/+1
2015-07-10Add unicode support in url_title functiondimonneon1-2/+2
2015-07-10Important noteAdrian Voicu1-0/+2
If you pass strings to the add_field() methods you won't be able to follow those by add_key() methods on those fields.
2015-07-10[ci skip] Clarify comments about libraries/drivers autoloadingAndrey Andreev1-4/+6
Close #3964
2015-07-09Fix #3965Andrey Andreev2-9/+4
2015-07-08[ci skip] Cleanup some whitespace in CI_Unit_testAndrey Andreev1-23/+23
2015-07-08Fix #3963Andrey Andreev2-3/+6
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 pull request #3952 from ftwbzhao/developAndrey Andreev3-2/+3
Fix SQlite3 list_fields()
2015-07-06Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developftwbzhao12-29/+12
Conflicts: user_guide_src/source/changelog.rst
2015-07-06[ci skip] Update config/migration.php commentsAndrey Andreev1-3/+3
Close #3951
2015-07-06[ci skip] Add missing changelog entries for PRs #3955, #3957Andrey Andreev1-0/+3
2015-07-06Merge pull request #3955 from ftwbzhao/ci3.0Andrey Andreev1-2/+2
key_prefix support for Cache increment() and decrement()