summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-31Merge pull request #4893 from tianhe1986/develop_fix_dbdriver_quoteAndrey Andreev2-2/+2
Fix compile_binds: do not use back references inside a character class.
2016-10-31Fix compile_binds: do not use back references inside a character class.tianhe19862-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
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 Andreev36-124/+756
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 Andreev5-4/+20
2016-10-28Merge branch 'release/3.1.2' into 3.1-stableAndrey Andreev5-16/+17
2016-10-28[ci skip] Fix upgrading instruction link titlesAndrey Andreev1-2/+2
2016-10-28[ci skip] Fix upgrading instruction link titlesAndrey Andreev1-2/+2
2016-10-28[ci skip] Prepare for 3.1.2 releaseAndrey Andreev4-5/+5
2016-10-28[ci skip] Add download link check to build-release.shAndrey Andreev1-0/+4
2016-10-28[ci skip] Add download link check to build-release.shAndrey Andreev1-0/+4
2016-10-28[ci skip] xss_clean() hardeningAndrey Andreev2-11/+12
- percent-sign tag (IE) - data: URI scheme inclinding whitespace (Chrome)
2016-10-28[ci skip] Add a bash script to help with releasesAndrey Andreev1-0/+95
2016-10-28[ci skip] Add changelog entry for & polish doc changes from PR #4826Andrey Andreev2-2/+10
2016-10-28Merge pull request #4826 from gxgpet/develop2Andrey Andreev2-1/+4
Make CI_Table::clear() reset captions
2016-10-28Improve byte-safetyAndrey Andreev5-41/+236
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-28[ci skip] Add upgrade instructions for CI_SessionsAndrey Andreev1-0/+26
2016-10-28Fix #4884Andrey Andreev2-1/+2
2016-10-27[ci skip] Another attempt at #4874Andrey Andreev1-2/+3
2016-10-27Fix #4871Andrey Andreev2-3/+6
2016-10-27[ci skip] Fix changelog entry formatting from last commitAndrey Andreev1-1/+1
2016-10-27Fix #4874Andrey Andreev2-9/+59
2016-10-27Close #4875Andrey Andreev2-1/+24
2016-10-27[ci skip] Add changelog entry for #4877Andrey Andreev1-0/+9
2016-10-27[ci skip] This is 3.1.2-devAndrey Andreev5-5/+21
2016-10-26Fix #4877Andrey Andreev1-5/+29
2016-10-24[ci skip] Update docs on trans_off()Andrey Andreev1-7/+7
2016-10-24[ci skip] Fix 3.1.1 download linkAndrey Andreev1-2/+2
2016-10-24Merge pull request #4868 from hex-ci/patch-2Andrey Andreev1-1/+1
[ci skip] Fix a doc link
2016-10-24Merge pull request #4868 from hex-ci/patch-2Andrey Andreev1-1/+1
[ci skip] Fix a doc link
2016-10-24Merge pull request #4867 from vkeranov/3.1-stableAndrey Andreev1-1/+1
[ci skip] Fix a changelog entry
2016-10-24Fix small doc problem.Hex1-1/+1
2016-10-23Small Changelog Fixvkeranov1-1/+1
2016-10-22[ci skip] Fix a changelog linkAndrey Andreev1-1/+1
2016-10-22[ci skip] Prepare for 3.1.1 releaseAndrey Andreev3-4/+4
2016-10-22Merge branch 'security/entity_decode' into 3.1-stableAndrey Andreev3-17/+32
2016-10-22Close #4830, #3649Andrey Andreev4-8/+51
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 Andreev2-3/+4
2016-10-21Merge pull request #4862 from gxgpet/remote-developAndrey Andreev2-1/+56
New function for Inflector helper: ordinal_format()
2016-10-21fixed small coding style issuesgxgpet1-5/+4
2016-10-21Fix #4865Andrey Andreev3-1/+2
2016-10-20ordinal_format will accept only non-negative natural numbers and return ↵George Petculescu2-7/+8
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 Petculescu4-58/+58
2016-10-20FV: throw BadMethodCallException when set_rules() called withoutAndrey Andreev4-2/+17