summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-09Merge branch '3.1-stable' into developAndrey Andreev3-5/+5
2017-11-09[ci skip] Fix patch for #5300Andrey Andreev3-5/+5
2017-11-09Attempt PHP 7.2 tests on TravisAndrey Andreev1-0/+2
2017-11-09Refactor CI_Config, CI_Hooks interaction (close #5323)Andrey Andreev2-17/+17
2017-11-07Merge branch '3.1-stable' into developAndrey Andreev4-7/+25
2017-11-07[ci skip] Deprecate extra parameters of the CAPTCHA helperAndrey Andreev4-8/+26
2017-11-07Implement data:image URIs in CAPTCHA helperAndrey Andreev3-36/+56
Also, switched to PNG by default and dropped JPEG; refactored image files GC. Close #5200
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-11-06[ci skip] Merge pull request #5326 from vinodselvin/patch-1Andrey Andreev1-2/+2
Bug in documentation
2017-11-05Bug in documentationVinod Selvin1-2/+2
when i clicked on Codeigniter repository on Contributing.md, it redirects to https://github.com/bcit-ci/CodeIgniter>, there is some extra greater than symbol, creating issue, so i fixed and creating pull request to you.
2017-11-03[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-11-02Fixed docblock on model function. Changed @param model from string to mixedAvrom1-1/+1
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-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-25Missing links for CI2 versions on documentationgonzalo-massa1-0/+3
Download links for CodeIgniter versions 2.2.4, 2.2.5 and 2.2.6 added to documentation (Installation > Downloading CodeIgniter)
2017-10-16Merge branch '3.1-stable' into developAndrey Andreev9-27/+33
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-12Merge pull request #5289 from zploskey/cleanup_form_validation_testsAndrey Andreev1-21/+21
Clean up form validation tests
2017-10-11Clean up form validation testsZach Ploskey1-21/+21
Remove a number unnecessary calls to reset_validation(). A new form_validation object is already initialized for every test in set_up(), so these lines do nothing unless multiple validations are done in the same test. Explicitly empty the $_POST array after each test that modifies it. Signed-off-by: Zach Ploskey <zach@ploskey.com>
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 #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-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