summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-10-02Merge pull request #4153 from jim-parry/doc/tocAndrey Andreev1-10/+10
[ci skip] Adjust user guide TOC
2015-10-02Merge pull request #4148 from zhanghongyi/generate-pulldownAndrey Andreev5-76/+121
[ci skip] Generate docs pulldown menu using sphinx toctree
2015-10-02Rearrange the TOC slightly, to support consistency between the side menu and ↵Master Yoda1-10/+10
the sphonx toctree-derived pulldown menu. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-10-02minor fixes: add back theme codesHongyi Zhang2-2/+3
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-10-02Fix indentationsHongyi Zhang3-21/+19
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-09-30add end modification message backHongyi Zhang1-0/+2
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-09-30refactor pulldown menu generation using sphinx toctreeHongyi Zhang5-69/+113
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-09-29Merge pull request #4126 from zoaked/patch-1Andrey Andreev2-2/+1
Persist config file rules when using FV reset_validation()
2015-09-28Update changelog.rstzoaked1-1/+0
2015-09-28Merge pull request #4143 from b1tc0re/patch-1Andrey Andreev1-2/+2
[ci skip] Fix a doc example
2015-09-28Merge pull request #4125 from jim-parry/fix/lang_testAndrey Andreev1-5/+17
Improve CI_Lang tests
2015-09-27cal_cel_otherДмитрий1-2/+2
forget to close a tag cal_cel_other
2015-09-26Fix the testing of non-alhpa idiomsMaster Yoda1-1/+1
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-26Removing config_rules from reset_validationzoaked1-1/+1
Signed-off-by: Junior Asparagus <zoaked@hotmail.com>
2015-09-26Removed reset_validation changes that were no longer neededzoaked1-2/+1
2015-09-26Removing config_rules from reset_validationzoaked1-6/+1
Signed-off-by: Junior Asparagus<zoaked@hotmail.com>
2015-09-24Fix the tabsMaster Yoda1-5/+0
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-24Fix the tabsMaster Yoda1-1/+0
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-24Fix the tabsMaster Yoda1-4/+4
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-22Added optional parameter to reset_validation()zoaked1-4/+2
2015-09-22Added optional parameter to reset_validation() in form_validation libraryzoaked1-1/+1
2015-09-22Styling changeszoaked1-3/+5
2015-09-21Merge pull request #4130 from jim-parry/fix/pulldown-navAndrey Andreev1-85/+117
Fixed the pulldown menu in docs Close #4043
2015-09-21Removed mention of the fix in the changelog - not a framework issue.Master Yoda1-1/+0
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-21Changes suggested by AndreyMaster Yoda2-3/+4
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-21Fixed the pulldown navMaster Yoda2-85/+118
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-21Merge branch 'fix/lang_test' of https://github.com/jim-parry/CodeIgniter ↵Master Yoda2-4/+21
into fix/lang_test
2015-09-21Update form_validation.rstzoaked1-2/+5
2015-09-21Update changelog.rstzoaked1-0/+1
2015-09-21Switch from saving copy of config to reset method parameterzoaked1-4/+5
2015-09-20Persist config file settings when resetting form_validationzoaked1-2/+3
When checking multiple arrays using form_validation you have to call reset_validation between each separate check due to the instance of the library being a singleton. The issue comes in when the settings are loaded from a config file as they are initially loaded from a parameter in the constructor, but are set to an empty array when resetting the class. To get around this issue a copy of the config parameter is made and then the copy is used to reset the rules when clearing.
2015-09-20The Lang unit testing claimed to be testing for non-alpha idioms, but wasn't.Master Yoda1-94/+99
Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-20Revert "Revert "The Lang unit testing claimed to be testing for non-alpha ↵Master Yoda1-6/+12
idioms, but wasn't. Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>"" This reverts commit 5f8fa02b9e386dfc474d8a6f2302e32674f2b55a.
2015-09-20Revert "The Lang unit testing claimed to be testing for non-alpha idioms, ↵Master Yoda1-12/+6
but wasn't. Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>" This reverts commit 1adf834231dae85e55c1bf2d19f3f4b28324f356.
2015-09-20The Lang unit testing claimed to be testing for non-alpha idioms, but wasn't.Master Yoda1-6/+12
Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-20The Lang unit testing claimed to be testing for non-alpha idioms, but wasn't.Master Yoda1-84/+89
Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-20The Lang unit testing claimed to be testing for non-alpha idioms, but wasn't.Master Yoda1-0/+1
Setup a new test method to isolate this. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-09-16Merge pull request #4119 from kenjis/fix-tutorialAndrey Andreev1-1/+1
[ci skip] Fix a typo in the tutorial
2015-09-16Fix typokenjis1-1/+1
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-09-10Merge pull request #4105 from rjbrooksjr/developAndrey Andreev1-1/+1
FV library to allow the pipe character within brackets
2015-09-09Change form validation library to allow the pipe character within square ↵rich1-1/+1
brackets
2015-08-31Merge pull request #4082 from tomaszturkowski/developAndrey Andreev1-1/+1
Simplify an if condition in DB.php
2015-08-31Merge pull request #4069 from ivantcholakov/developAndrey Andreev1-1/+1
[ci skip] Correct wm_shadow_distance default value in Image_lib docs
2015-08-28Change if is not set or count equals zero into if emptyTomasz Turkowski1-1/+1
2015-08-23Merge pull request #4068 from dotancohen/developAndrey Andreev1-2/+2
[ci skip] Clarify URI routing docs on dashes replacement
2015-08-23A minor documentation correction about Image_lib, the default value of the ↵Ivan Tcholakov1-1/+1
option 'wm_shadow_distance' is 2 actually.
2015-08-23Specify to which character dashes will be replacedDotan Cohen1-2/+2
2015-08-14Merge branch '3.0-stable' into developAndrey Andreev2-20/+1
2015-08-14Fix #4052Andrey Andreev2-20/+1
The bug actually had two instances: - Callback routes with literal matches and HTTP verbs has never worked - The reported issue in #4052, which is a regression introduced in 3.0.1 with abc299b3a234eb7da1b7e3d257b7eba2da649219 Removed the literal matches logic altogether to avoid similar issues in the future and reduce code complexity. The same logic is performed with the regular expressions logic.
2015-08-13Fix typo in commentsClaudio Galdiolo1-1/+1