summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev176-350/+350
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-05[ci skip] Add changelog entry for PR #5369Andrey Andreev1-0/+1
2018-01-05[ci skip] Merge pull request #5369 from tianhe1986/develop_cache_memcacheAndrey Andreev1-2/+12
Cache_memcached: setting initial value with increment/decrement when not exist
2017-12-27Merge pull request #5367 from carusogabriel/clean-elsesAndrey Andreev8-45/+24
Clean elses
2017-12-20Merge pull request #5354 from carusogabriel/refactoring-testsAndrey Andreev23-76/+75
Refactoring tests Conflicts resolved: tests/codeigniter/core/Utf8_test.php tests/codeigniter/database/query_builder/group_test.php tests/codeigniter/libraries/Form_validation_test.php
2017-11-29[ci skip] Fix allow_get_array defaulting to FALSE if it doesn't existAndrey Andreev2-1/+2
2017-11-28[ci skip] Add changelog entry for PR #5342Andrey Andreev1-0/+1
2017-11-28[ci skip] Polish changes from PR #5342Andrey Andreev1-1/+3
2017-11-28[ci skip] Merge pull request #5342 from aanbar/pagination-bc-fixAndrey Andreev1-2/+3
Preserve attributes from pagination config files Related: #4454
2017-11-20[ci skip] More docs updates following #5330Andrey Andreev5-24/+8
2017-11-15Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332Andrey Andreev1-0/+8
2017-11-10Close #5330Andrey Andreev3-13/+8
2017-11-10Fix #5331Andrey Andreev3-1/+11
2017-11-10Try testing on PHP master branch builds too (allowed failures)Andrey Andreev1-0/+4
2017-11-09More on #5003Andrey Andreev2-8/+16
2017-11-09Move PHP 7.2 into the main testing matrixAndrey Andreev1-1/+0
2017-11-09Don't try to run 'DB=mysql' tests on PHP 7.2Andrey Andreev1-0/+2
2017-11-09Attempt PHP 7.2 tests on TravisAndrey Andreev1-0/+2
2017-11-09[ci skip] Fix patch for #5300Andrey Andreev3-5/+5
2017-11-07[ci skip] Deprecate extra parameters of the CAPTCHA helperAndrey Andreev4-8/+26
2017-11-06[ci skip] Merge pull request #5326 from vinodselvin/patch-1Andrey Andreev1-2/+2
Bug in documentation
2017-11-06[ci skip] Merge pull request #5321 from PrestigeT/documentationAndrey Andreev1-1/+1
Fixed docblock on model function. Changed @param model from string to mixed
2017-10-25[ci skip] Merge pull request #5311 from gonzalo-massa/gonzalo-massa-patch-1Andrey Andreev1-0/+3
Download links for versions 2.2.4 to 2.2.6 added to docs
2017-10-16[ci skip] Use INTL_IDNA_VARIANT_UCS46 to convert non-ASCII domain names in ↵Andrey Andreev3-3/+11
emails Close #5300
2017-10-13Fix #5297Andrey Andreev2-4/+9
2017-10-12Merge pull request #5289 from zploskey/cleanup_form_validation_testsAndrey Andreev1-19/+21
Clean up form validation tests
2017-10-09[ci skip] Merge pull request #5295 from mamat-rahmat/fix-docs-code-blockAndrey Andreev1-2/+2
Fix broken .htaccess example code-block
2017-10-09[ci skip] Merge pull request #5292 from ajdunn2/developAndrey Andreev2-2/+2
Small spelling fix
2017-10-04[ci skip] Fix a typo in pagination docsAndrey Andreev1-2/+2
2017-10-03[ci skip] Add changelog entry for #5282Andrey Andreev1-0/+1
2017-10-03Merge pull request #5282 from pgee70/patch-1Andrey Andreev1-1/+1
Fix ORDER BY clauses being reset by count_all_results()
2017-10-03Update DB_query_builder.phppgee701-1/+1
recent changes broke query ordering giving a warning in line 1238 = '$this->qb_cache_orderby = array_merge($this->qb_cache_orderby, $qb_orderby);' this was because on subsequent re-queries, the qb_cache_orderby was set to NULL not Array() as it is should be (and is instantiated originally .
2017-10-02[ci skip] Merge pull request #5281 from pawelkg/developAndrey Andreev1-2/+2
Adding some letters translated to Y in foregin_chars.php
2017-09-29Add testcase and changelog entry for #5278Andrey Andreev2-2/+4
2017-09-29[ci skip] Revert file permission change from PR #5278Andrey Andreev1-0/+0
2017-09-29Merge pull request #5278 from Uekawa/auto_linkAndrey Andreev1-1/+1
Fix auto_link trailing slash
2017-09-27Fix #5276Andrey Andreev3-16/+9
2017-09-25[ci skip] Mark the start of 3.1.7-devAndrey Andreev6-4/+26
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev4-5/+5
2017-09-25[ci skip] Add upgrade instructions about the APC deprecationAndrey Andreev1-0/+14
2017-09-25[ci skip] Fix potential object injection in apc cache driver; deprecate the ↵Andrey Andreev2-26/+27
apc driver
2017-09-16[ci skip] Merge pull request #5265 from mehdibo/patch-1Andrey Andreev1-1/+1
Fixed dbprefix() documentation
2017-09-13Fix #5260Andrey Andreev3-5/+63
2017-09-04Fix Travis-CI failuresAndrey Andreev1-0/+1
2017-09-04Fix #5246Andrey Andreev2-0/+2
2017-08-31[ci skip] Add changelog entry for #5243Andrey Andreev1-0/+1
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
Fix for DBLIB subdriver to get the right version number of SQL Server.
2017-08-25[ci skip] Fix #5236Andrey Andreev5-4/+5
2017-07-27Update composer.jsonInstructor, Computer Systems Technology1-1/+1
Replace IRC reference with Slack
2017-07-27Update readme.rstInstructor, Computer Systems Technology1-1/+1