summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-12Merge remote-tracking branch 'upstream/develop' into developAhmad Anbar25-140/+59
2015-01-12Change CI_DB_driver::field_data() signatureAndrey Andreev20-110/+22
The parameter is mandatory, it doesn't make sense to have a default empty string value only to check for it.
2015-01-12Merge pull request #3468 from dbernar1/test-5.2Andrey Andreev3-29/+35
Added support for running unit tests on PHP 5.2
2015-01-12Merge pull request #3467 from aanbar/which_field_failedAndrey Andreev2-1/+2
Form_validation: Which field failed
2015-01-12Updated to use the language fileAhmad Anbar2-1/+2
2015-01-12Added support for running unit tests on PHP 5.2Dan Bernardic3-29/+35
Signed-off-by: Dan Bernardic <dan.bernardic@gmail.com>
2015-01-11Show the name of the field that doesn't have error message set.Ahmad Anbar1-1/+1
2015-01-11Merge remote-tracking branch 'upstream/develop' into developAhmad Anbar273-3232/+3765
2015-01-11Merge pull request #3466 from dbernar1/non-english-lang-testAndrey Andreev2-5/+15
Added a unit test for #3464
2015-01-11Added a unit test for #3464Dan Bernardic2-5/+15
Signed-off-by: Dan Bernardic <dan.bernardic@gmail.com>
2015-01-11Fix #3464Andrey Andreev1-1/+1
2015-01-10Travis-CI doesn't have PHP 5.3.0 ...Andrey Andreev1-1/+1
2015-01-09Bulk (mostly documentation) updateAndrey Andreev206-737/+740
- Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450
2015-01-09Fix E_WARNING in CI_Security::entity_decode() on PHP<5.3.4Andrey Andreev1-1/+6
Related: #3057 Previous commit: 487d1ae060e6414e0a59c9752a4914fa3b8c4710
2015-01-06Merge pull request #3444 from peterdenk/russian-timezonesAndrey Andreev2-5/+5
Russian time zones were changed on Oct 26 2014.
2015-01-06Documentation updated.Peter Denk2-3/+3
Signed-off-by: Peter Denk <peter@skypay.se>
2015-01-05[ci skip] Fix improper wording in upgrade notesAndrey Andreev1-1/+1
2015-01-05Fix #3460Andrey Andreev1-1/+1
2015-01-05Remove CI_Form_validation::xss_clean()Andrey Andreev3-26/+32
More details in the commit diff itself, and here: https://github.com/benedmunds/CodeIgniter-Ion-Auth/issues/683#issuecomment-66598821
2015-01-05Polish changes following PR #3416Andrey Andreev2-206/+223
2015-01-05Merge pull request #3458 from vlakoff/documentationAndrey Andreev1-3/+1
Update reserved controller names
2015-01-04Update reserved controller namesvlakoff1-3/+1
2015-01-04PR #3452Andrey Andreev1-1/+1
2015-01-04Merge pull request #3457 from vlakoff/hooksAndrey Andreev1-4/+4
Change order of hooks loading
2015-01-04Change order of hooks loadingvlakoff1-4/+4
Let override hooks via environment-specific config.
2015-01-03Fix #3453Andrey Andreev1-1/+1
Allow hyphens and underscores in language idioms.
2014-12-25Russian time zones were changed on Oct 26 2014.Peter Denk1-3/+3
2014-12-25Merge pull request #3442 from galdiolo/patch-4Andrey Andreev2-2/+2
[ci skip] fix path for individual news item
2014-12-25Merge pull request #3441 from galdiolo/patch-3Andrey Andreev1-1/+1
[ci skip] fix a typo
2014-12-25Merge pull request #3439 from galdiolo/patch-1Andrey Andreev1-1/+3
[ci skip] use $title variable in the view
2014-12-23use $title variable in the viewClaudio Galdiolo1-1/+1
$data['title'] is defined in the controller but it is not used in the view
2014-12-23fix path for individual news itemClaudio Galdiolo1-1/+1
href resolves to index.php/slug instead of index.php/news/slug
2014-12-23fix typoClaudio Galdiolo1-1/+1
need need -> need
2014-12-23use $title variable in the viewClaudio Galdiolo1-1/+3
$data['title'] is defined in the controller but it is not used in the view
2014-12-23Merge pull request #3437 from galdiolo/developAndrey Andreev1-1/+1
[ci skip] fix a comment typo
2014-12-22fix typo in the commentsClaudio Galdiolo1-1/+1
2014-12-21Merge pull request #3429 from jim-parry/userguide/fix-reference-levelAndrey Andreev4-3/+18
User Guide Tuning
2014-12-20User Guide TuningJames L Parry4-3/+18
Adjust the heading levels in the writeups for the input, loader, security and unit testing libraries, to match the other library writeups. Specifically, the class reference section in each of these was appearing as a sub-level in the toctree, when it should be at the same level. Signed-off-by:James L Parry <jim_parry@bcit.ca>
2014-12-19[ci skip] Add missing upgrade step from 2.1.4 to 2.2.0 in the docsAndrey Andreev2-1/+22
2014-12-19Merge pull request #3425 from druu/patch-3Andrey Andreev1-1/+1
[ci skip] Enabled word-wrap in tables (doc styling)
2014-12-19Enabled word-wrap in tablesDavid Wosnitza1-1/+1
Desktop only; prevents having to scroll horizontally to see contents of larger tables
2014-12-17Add support for configuring socket pipe connections in 'mysqli'Andrey Andreev2-6/+19
Supersedes PR #3415
2014-12-17Extend fix for #3419Andrey Andreev1-17/+21
2014-12-16Merge pull request #3420 from albertleao/patch-1Andrey Andreev1-1/+1
Fixed typo
2014-12-16Fixed typoalbertleao1-1/+1
2014-12-16Merge pull request #3416 from jim-parry/userguide/db_driver_referenceAndrey Andreev3-6/+414
User Guide - DB Driver Reference
2014-12-16Fix #3419Andrey Andreev2-45/+37
2014-12-16Merge pull request #3418 from warpcode/developAndrey Andreev1-1/+1
Fixes #3417
2014-12-16Remove trailing newlineJason Taylor1-1/+1
2014-12-16Fix Issue #3417warpcode1-2/+2