summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-09[ci skip] Merge pull request #5292 from ajdunn2/developAndrey Andreev2-2/+2
Small spelling fix
2017-10-09Fix broken .htaccess example code-blockMamat Rahmat1-2/+2
- remove double colon before code-block - change lexer into apacheconf Fixes #5283 Signed-off-by: Mamat Rahmat <coderbodoh@gmail.com>
2017-10-08Small spelling fixAJ Dunn2-2/+2
Missing ‘e’ in word ‘certificates’. Signed-off-by: AJ Dunn <andrew.dunn2@outlook.com.au>
2017-10-06Merge pull request #5286 from zploskey/issue_5202Andrey Andreev2-0/+16
Fix Error "Cannot create references to/from string offsets"
2017-10-06Fix issue 5202Zach Ploskey2-0/+16
Fix attempting to access data_ref before it is defined when validating an array input with multiple explicitly specified keys. Adds a test for the issue. Signed-off-by: Zach Ploskey <zach@ploskey.com>
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-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-10-02[ci skip] Drop docs section about short PHP tags (close #5280)Andrey Andreev1-15/+1
2017-09-30Adding some letters translated to Y in foregin_chars.phpPaweł Kłopotek-Główczewski1-2/+2
Signed-off-by: Paweł Kłopotek-Główczewski <pawelkg@pawelkg.com>
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-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-29Merge pull request #5278 from Uekawa/auto_linkAndrey Andreev1-1/+1
Fix auto_link trailing slash
2017-09-29Fix auto_linkUekawa1-1/+1
2017-09-27Fix #5276Andrey Andreev3-16/+9
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev20-94/+196
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-16[ci skip] Merge pull request #5265 from mehdibo/patch-1Andrey Andreev1-1/+1
Fixed dbprefix() documentation
2017-09-16Fixed dbprefix()Mehdi Bounya1-1/+1
$this->db->set_dbprefix('newprefix'); $this->db->dbprefix('tablename'); Would output newprefixtablename not newprefix_tablename
2017-09-13Fix #5260Andrey Andreev3-5/+63
2017-09-04Fix Travis-CI failuresAndrey Andreev1-0/+1
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-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-31Refactoring some codeblocks.Andrei Rosseti1-26/+15
2017-08-30Fixed DBLIB subdriver to get the right version number of SQL Server.Andrei Rosseti1-0/+27
2017-08-29Optimize the join() type regexp and remove the extra leading space when no ↵Andrey Andreev1-3/+3
special join-type is used
2017-08-29Polish changes from & add changelog entry for PR #5242Andrey Andreev2-29/+9
Also, further simplified the join() logic
2017-08-29Merge pull request #5242 from jvyyuie/naturalAndrey Andreev1-4/+18
add NATURAL JOIN types
2017-08-29remove unnecessary empty linesShang Ning1-2/+0
2017-08-29add NATURAL JOIN types to fix #5240Shang Ning1-4/+20
2017-08-25[ci skip] Fix #5236Andrey Andreev5-4/+5
2017-08-07[ci skip] Update docs & add changelog entry for PR #5217Andrey Andreev2-1/+2
2017-08-07Merge pull request #5217 from erkaperka/developAndrey Andreev1-2/+2
Minor change in _display() method in CI_Output class allowing us to o…
2017-08-05Minor change in _display() method in CI_Output class allowing us to override ↵Erik Nord1-2/+2
output data with an empty string. Without this change CI chooses to use the default "final_output" var; even though we passed an empty string to the method.
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
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