summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2016-10-31Merge pull request #4886 from tianhe1986/develop_dbdriver_quoteAndrey Andreev2-2/+2
Detect double-quoted strings in DB::compile_binds()
2016-10-28Revert "Match single quote in is_write_type()."tianhe19861-1/+1
This reverts commit eef5951ae313c2c4080e94b8c1aa743a6d6c93b7. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Merge branch '3.1-stable' into developAndrey Andreev27-107/+550
Resolved conflicts: system/core/CodeIgniter.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst user_guide_src/source/libraries/form_validation.rst
2016-10-28[ci skip] Mark the start of 3.1.3-devAndrey Andreev1-1/+1
2016-10-28[ci skip] Prepare for 3.1.2 releaseAndrey Andreev1-1/+1
2016-10-28[ci skip] xss_clean() hardeningAndrey Andreev1-10/+11
- percent-sign tag (IE) - data: URI scheme inclinding whitespace (Chrome)
2016-10-28Merge pull request #4826 from gxgpet/develop2Andrey Andreev1-0/+1
Make CI_Table::clear() reset captions
2016-10-28Improve byte-safetyAndrey Andreev4-41/+235
2016-10-28Match single quote in is_write_type().tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28Match both single and double quote in compile_binds().tianhe19862-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-10-28[ci skip] Clear trailing whitespace from PR #4834Andrey Andreev1-1/+1
2016-10-28Fix #4884Andrey Andreev1-1/+1
2016-10-27[ci skip] Another attempt at #4874Andrey Andreev1-2/+3
2016-10-27Fix #4871Andrey Andreev1-3/+5
2016-10-27Fix #4874Andrey Andreev1-9/+54
2016-10-27Close #4875Andrey Andreev1-1/+20
2016-10-27[ci skip] This is 3.1.2-devAndrey Andreev1-1/+1
2016-10-26Fix #4877Andrey Andreev1-5/+29
2016-10-22[ci skip] Prepare for 3.1.1 releaseAndrey Andreev1-1/+1
2016-10-22Merge branch 'security/entity_decode' into 3.1-stableAndrey Andreev1-17/+22
2016-10-22Close #4830, #3649Andrey Andreev2-6/+48
2016-10-22Allow binding 0, null out of array in query()Andrey Andreev1-1/+1
2016-10-21[ci skip] Add changelog entry for PR #4862Andrey Andreev1-3/+3
2016-10-21Merge pull request #4862 from gxgpet/remote-developAndrey Andreev1-0/+39
New function for Inflector helper: ordinal_format()
2016-10-21fixed small coding style issuesgxgpet1-5/+4
2016-10-21Fix #4865Andrey Andreev2-1/+1
2016-10-20ordinal_format will accept only non-negative natural numbers and return ↵George Petculescu1-2/+2
original value on failure + docs update regarding this.
2016-10-20fixed unnecessary file termination for Number helperGeorge Petculescu1-1/+1
2016-10-20moved ordinal_format() helper function from Number helper to Inflector helperGeorge Petculescu2-41/+41
2016-10-20FV: throw BadMethodCallException when set_rules() called withoutAndrey Andreev1-1/+5
2016-10-20[ci skip] Polish changes and add a changelog entry for PR #4855Andrey Andreev1-1/+1
2016-10-20 fixed coding style + removal of extra paranthesisgxgpet1-2/+3
2016-10-20fixed floating for ordinal_format()gxgpet1-1/+1
2016-10-20small refactorisationsgxgpet1-2/+12
2016-10-20Update Xmlrpc.phpInstructor, Computer Systems Technology1-1/+1
Fix style
2016-10-20[ci skip] Polish changes and add a changelog entry for PR #4855Andrey Andreev1-2/+2
2016-10-20Accepting strings too, 0 allowed.gxgpet1-1/+1
2016-10-20Merge pull request #4855 from jim-parry/fix/xmlrpc-timeoutInstructor, Computer Systems Technology1-3/+2
Fix xmlrpc timeout, #4843
2016-10-20Merge pull request #4863 from gxgpet/develop4Andrey Andreev1-0/+1
Add missing method chaining support to CI_Table::set_caption()
2016-10-20- fixed method chaining for set_caption in Table helper.George Petculescu1-0/+1
2016-10-19added ordinal_format() to Number helper; added to docs the info.George Petculescu1-0/+29
2016-10-18Fix xmlrpc timeout, #4843Master Yoda1-3/+2
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2016-10-17Fix #4851Andrey Andreev6-10/+10
2016-10-11[ci skip] Add new HTTP status codesAndrey Andreev1-1/+6
https://tools.ietf.org/html/rfc2817 https://tools.ietf.org/html/rfc6585 Requested in #4835
2016-10-11Merge pull request #4834 from renedekat/patch-1Andrey Andreev1-2/+31
Updated list of words that aren't countable in is_countable() inflector helper
2016-10-10- revert: set_caption method chaining will be fixed lately.George Petculescu1-1/+0
2016-10-10Updated list of words that aren't countableRené de Kat1-2/+31
Updated list of words that are the same in plural and singular form in English.
2016-10-03[ci skip] Alter a docblockAndrey Andreev1-1/+1
2016-10-03Fix #4823Andrey Andreev1-2/+25
2016-10-01- fixed codingstyle (2) ...George Petculescu1-1/+1