summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2020-01-28Merge branch '3.1-stable' into developAndrey Andreev4-6/+40
Conflicts resolved: .travis.yml system/database/DB_query_builder.php system/helpers/captcha_helper.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Zip.php
2020-01-28[ci skip] Add comment about PR #5893 changesAndrey Andreev1-1/+2
2020-01-28Merge pull request #5893 from aitorres/developLonnie Ezell1-2/+2
ZIP Library Memory Optimization
2020-01-27optimize memory allocation on zip libraryAndrés Ignacio Torres1-2/+2
Signed-off-by: Andrés Ignacio Torres <andresitorresm@gmail.com>
2020-01-27[ci skip] Merge pull request #5891 from franciscollanquipichun/developAndrey Andreev26-26/+26
Inserted required attribute `lang` in html tags
2020-01-27[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_joinAndrey Andreev1-1/+1
Added FULL OUTER JOIN to QueryBuilder
2020-01-27[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_joinAndrey Andreev1-1/+1
Added FULL OUTER JOIN to QueryBuilder
2020-01-27[ci skip] Fix #5879Andrey Andreev1-3/+3
2020-01-27[ci skip] Fix #5879Andrey Andreev1-3/+3
2020-01-25inserted required attribute in html tagFrancisco Javier Llanquipichun Garcia26-26/+26
Signed-off-by: Francisco Javier Llanquipichun Garcia <francisco.llanquipichun@gmail.com>
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-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-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-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-21[ci skip] Fix #5857Andrey Andreev1-0/+4
2019-10-14feat: support auto_increment for orace 12.1ytetsuro1-1/+23
2019-10-10fix static field nameClaudio Galdiolo1-1/+1
field with name $_delete_name already defined, use $_sRemove_name
2019-10-08Merge pull request #5842 from sapics/chore/fix-indentAndrey Andreev10-28/+28
Fix indentation / clear whitespace
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-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-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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-28 20:01:32 +0100