summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-01-27[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_joinAndrey Andreev2-2/+2
Added FULL OUTER JOIN to QueryBuilder
2020-01-27[ci skip] Merge pull request #5885 from etrianag/developAndrey Andreev1-2/+2
Update documentation for method parse_string
2020-01-27[ci skip] Fix #5879Andrey Andreev1-3/+3
2020-01-27Remove parameter type from Description.etrianag1-1/+1
2020-01-27[ci skip] Add changelog for PR #5883Andrey Andreev1-0/+1
2020-01-27[ci skip] Merge pull request #5883 from adevesa/image_lib-webpAndrey Andreev2-0/+27
image/webp for Image lib
2020-01-23added FULL OUTER join option to documentationChristian Mohr1-1/+1
2020-01-14Update mimes.phpDevesa Agustín1-4/+3
2020-01-14Revert "Delete mimes.php"Devesa Agustín1-0/+185
This reverts commit 30e6bab491f3870d46af5f22432d829f083c3bd8.
2020-01-14Delete mimes.phpDevesa Agustín1-185/+0
2020-01-13Update documentation for method parse_stringetrianag1-2/+2
Fix description of parameter $template in method parse_string.
2020-01-08Update Image_lib.phpDevesa Agustín1-9/+21
2020-01-08Update imglib_lang.phpDevesa Agustín1-0/+1
2020-01-08Update Image_lib.phpDevesa Agustín1-19/+33
2020-01-08change appliation/config.php for webp mimeDevesa Agustín1-3/+4
2020-01-02Added FULL [OUTER] JOIN to CI_DB_query_builderChristian Mohr1-1/+1
2019-11-25[ci skip] Merge pull request #5856 from ↵Andrey Andreev3-4/+50
ytetsuro/fix/oracle12.1-support-auto-increment Enhancement oracle dbforge, auto_increment can be used when using oracle 12.1.
2019-11-01[ci skip] Merge pull request #5861 from nebkat/patch-1Andrey Andreev1-1/+1
cache: redis: Check version of redis not phpredis
2019-11-01[ci skip] Merge pull request #5859 from indrakaw/gitattributesAndrey Andreev1-0/+3
Exclude user_guide directory from composer installation by GitAttributes. This would allow Composer users to use --prefer-dist in order to avoid downloading the entire user guide
2019-10-28feat: Modified to useable auto increment.ytetsuro1-1/+25
2019-10-28fix: Fixed a bug that could not get the version number when first call.ytetsuro1-2/+2
2019-10-21cache: redis: Check version of redis not phpredisNebojsa Cvetkovic1-1/+1
PhpRedis is installed as redis. Change matches the check in the Redis session driver.
2019-10-18Fix typo on .gitattributesIndra Kurniawan1-1/+3
I forgot to put `export-ignore` statement.
2019-10-18Include user_guide into .gitattributesIndra Kurniawan1-0/+1
See https://github.com/bcit-ci/CodeIgniter/issues/5843
2019-10-14feat: support auto_increment for orace 12.1ytetsuro1-1/+23
2019-10-08[ci skip] Merge pull request #5849 from Lablnet/patch-1Andrey Andreev1-0/+1
Added Infinix manufacture in user_agents.php
2019-10-08Merge branch 'develop' into patch-1Andrey Andreev18-50/+66
2019-10-08Merge pull request #5842 from sapics/chore/fix-indentAndrey Andreev15-41/+41
Fix indentation / clear whitespace
2019-10-08[ci skip] Merge pull request #5851 from ossamamehmood/patch-1Andrey Andreev1-0/+4
Fix for #5711 and added two more models
2019-10-08Merge pull request #5832 from gxgpet/developAndrey Andreev1-1/+9
Improve create_captcha()'s logging
2019-10-08removes double quotesGeorge Petculescu1-1/+1
2019-10-08Merge pull request #5836 from sapics/travis/trustyAndrey Andreev1-8/+12
Update Ubuntu version from Precise to Trusty on Travis
2019-10-05Update user_agents.phpOssama Mehmood1-0/+4
2019-10-02Update user_agents.phpMuhammad Umer Farooq1-0/+1
2019-09-25Fix indentsapics15-41/+41
2019-09-22adding $ to var names in the log messageGeorge Petculescu1-1/+1
2019-09-22adding $img_path in curly; fixing words orderGeorge Petculescu1-1/+1
2019-09-22if+elseif => if + ifGeorge Petculescu1-1/+3
2019-09-22Merge pull request #5834 from najdanovicivan/qb-count-having-fixAndrey Andreev1-1/+1
Fix count_all_result if QB query contains HAVING clause
2019-09-22Merge pull request #5837 from sapics/travis/fix-warningAndrey Andreev1-1/+1
Fix deprecation warning on Travis
2019-09-19Merge branch '3.1-stable' into developAndrey Andreev20-98/+160
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-09-19[ci skip] Begin 3.1.12-devAndrey Andreev6-5/+27
2019-09-19[ci skip] Fix changelog links to session libraryAndrey Andreev1-6/+6
2019-09-19Replace master to nightly on Travissapics1-3/+3
From the reference of the travis, nightly is the recommended one. https://docs.travis-ci.com/user/languages/php/ It also updates built version. `master`: version 8.0.0-dev (built: Feb 11 2019 07:59:12) `nightly`: version 8.0.0-dev (built: Sep 3 2019 09:50:37)
2019-09-19Replace mikey179/vfsStream to mikey179/vfsstreamsapics1-1/+1
This fixes following deprecation warning. Deprecation warning: require-dev.mikey179/vfsStream is invalid, it should not contain uppercase characters. Please use mikey179/vfsstream instead. Make sure you fix this as Composer 2.0 will error.
2019-09-19Replace hhvm to hhvm-3.30 on Travissapics1-4/+4
Composer is not support hhvm any more, thus, composer cause error in hhvm-4.x. hhvm-3.30 is the last php support version as https://hhvm.com/blog/2018/12/17/hhvm-3.30.html
2019-09-19Add PHP 7.4snapshot tests on Travissapics1-0/+4
2019-09-19Update Ubuntu from Precise to Trusty on Travissapics1-1/+1
2019-09-18[ci skip] Update Cache library Redis driver to work with phpRedis 5, ↵Andrey Andreev2-1/+13
similarly to PR #5816 (also add changelog entry)
2019-09-18[ci skip] Merge pull request #5831 from DeanWunder/patch-1Andrey Andreev1-1/+1
Fixed HTML type attribute for input field in tutorial