summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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
2019-09-18Merge pull request #5835 from dangereyes88/developProject lead, CodeIgniter1-1/+1
Update typography.rst
2019-09-18Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev2-2/+2
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
2019-09-17Merge pull request #5835 from dangereyes88/developProject lead, CodeIgniter1-1/+1
Update typography.rst
2019-09-17Update typography.rstAbdul Haq Sheikh1-1/+1
Corrected Typo
2019-09-13Fix count_all_result if QB query contains HavingNajdanovic Ivan1-1/+1
Signed-off-by: Najdanovic Ivan <najdanovicivan@gmail.com>
2019-09-08improve create_captcha loggingGeorge Petculescu1-1/+7
2019-09-08Fixed HTML type attribute for input field.DeanWunder1-1/+1
Input is not a valid value for the type attribute for an input tag. Replaced with text, a valid value. https://www.w3schools.com/tags/att_input_type.asp
2019-09-05[ci skip] Remove a few leftover trailing spaces from PR #5816Andrey Andreev1-5/+5
2019-09-05[ci skip] Merge pull request #5816 from mchobbylong/adapt-php-redisAndrey Andreev1-7/+48
Adapt to new version of php-redis
2019-09-05[ci skip] Remove a few leftover trailing spaces from PR #5816Andrey Andreev1-5/+5
2019-09-05[ci skip] Merge pull request #5816 from mchobbylong/adapt-php-redisAndrey Andreev1-7/+48
Adapt to new version of php-redis
2019-09-05[ci skip] Merge pull request #5828 from mchobbylong/alter-php5-validate-idAndrey Andreev1-1/+1
Alter php5_validate_id()
2019-09-05[ci skip] Merge pull request #5828 from mchobbylong/alter-php5-validate-idAndrey Andreev1-1/+1
Alter php5_validate_id()
2019-09-03Alter php5_validate_id()Michael Long1-1/+1
2019-09-03revert: Alter php_validate_id()Michael Long1-1/+1
2019-09-03Rename to _ping_successMichael Long1-5/+5
2019-09-03Delete unnecessary functionsMichael Long1-38/+6
2019-08-23Refactor implementation of #5816Michael Long1-21/+56
2019-08-14Define constant PHPREDIS_VERSIONMichael Long1-2/+4
2019-08-13Use version_compare to avoid method checksMichael Long1-2/+2
2019-08-13Adapt to styleguideMichael Long1-10/+10
2019-08-13[ci skip] Add update mimes.php step to 3.1.11 upgrade instructionsAndrey Andreev1-0/+6
2019-08-13[ci skip] Merge pull request #5815 from kamaslau/patch-2Andrey Andreev1-1/+1
Fix .aac file mime type
2019-08-13[ci skip] Merge pull request #5815 from kamaslau/patch-2Andrey Andreev1-1/+1
Fix .aac file mime type
2019-08-13[ci skip] Merge pull request #5808 from harrysrevis/developAndrey Andreev1-6/+17
Correct / Added characters
2019-08-13[ci skip] Merge pull request #5808 from harrysrevis/developAndrey Andreev1-6/+17
Correct / Added characters
2019-08-12Add parameter descriptionMichael Long1-3/+6