summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2019-10-08Merge pull request #5842 from sapics/chore/fix-indentAndrey Andreev11-32/+32
Fix indentation / clear whitespace
2019-10-08Merge pull request #5832 from gxgpet/developAndrey Andreev1-3/+14
Improve create_captcha()'s logging Conflicts resolved: system/helpers/captcha_helper.php
2019-10-08Merge pull request #5832 from gxgpet/developAndrey Andreev1-1/+9
Improve create_captcha()'s logging
2019-10-08[ci skip] Fix #5840Andrey Andreev1-5/+22
2019-10-08removes double quotesGeorge Petculescu1-1/+1
2019-09-27Merge tag '3.1.11' of git://github.com/bcit-ci/CodeIgniter into devFlorian Pritz22-126/+179
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2019-09-25Fix indentsapics11-32/+32
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 #5834 from najdanovicivan/qb-count-having-fixAndrey Andreev1-1/+1
Fix count_all_result if QB query contains HAVING clause
2019-09-19Merge branch '3.1-stable' into developAndrey Andreev14-96/+110
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 Andreev1-1/+1
2019-09-19[ci skip] 3.1.11 releaseAndrey Andreev1-1/+1
2019-09-18[ci skip] Update Cache library Redis driver to work with phpRedis 5, ↵Andrey Andreev1-1/+12
similarly to PR #5816 (also add changelog entry)
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-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-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-12Add parameter descriptionMichael Long1-3/+6
2019-08-12Adapt to new version of php-redisMichael Long1-6/+39
2019-08-02[ci skip] Fix a CSRF-related bugAndrey Andreev1-0/+1
2019-07-16Fix #5796Andrey Andreev3-3/+3
2019-07-15[ci skip] Fix #5788Andrey Andreev1-1/+1
2019-06-23[ci skip] Merge pull request #5783 from gxgpet/developAndrey Andreev1-2/+4
Session files driver to return the failure status code instead of Exception throwing
2019-06-23Session files driver to return failure status code (+logging) instead of ↵George Petculescu1-2/+4
Exception throwing
2019-06-19Fix #5774Andrey Andreev1-1/+1
2019-06-19[ci skip] Merge pull request #5781 from gxgpet/developAndrey Andreev1-2/+1
Fixes php5_validate_id() method calling from Redis session driver
2019-06-18Calling php5_validate_id() in the right place, for Redis session driverGeorge Petculescu1-2/+1
2019-06-02Close #5763Andrey Andreev1-0/+7
2019-05-11[ci skip] Merge pull request #5753 from exussum12/fixIncrRedisAndrey Andreev1-2/+2
Fix increment / decrement in redis
2019-05-11[ci skip] Merge pull request #5752 from exussum12/alternativeRedisFixAndrey Andreev1-12/+3
Alterntive redis fix
2019-05-10Update Cache_redis.phpScott Dutton1-1/+1
2019-05-10[ci skip] Fix #5755Andrey Andreev1-0/+7
2019-05-10Merge pull request #5744 from sharadrsoni/patch-1Andrey Andreev1-2/+2
Adding support for proper CRLF
2019-05-08Fix increment / decrementScott Dutton1-3/+3
also fixed a value incorrectly returned docblock says array but bool returned
2019-05-08Alterntive redis fixScott Dutton1-12/+3
2019-05-07Update Log.phpSharad Soni1-1/+1
Removed \n as now we are adding PHP_EOL