summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-20Added code-block tag to make sphinx happy with urls.rstMaster Yoda1-0/+2
2017-07-20Remove changes to general/urls.rstMaster Yoda1-2/+2
2017-07-20Fix some mistakes in the user guideMaster Yoda5-9/+8
2017-07-14[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_typeAndrey Andreev1-1/+1
add is_write_type method for merge query
2017-07-13add is_write_type method for merge queryytetsuro1-1/+1
Signed-off-by: tetsuro yoshikawa <phper.0o0@gmail.com>
2017-07-10[ci skip] Merge pull request #5128 from lloricode/profiler-pre-tagAndrey Andreev1-2/+14
Profiler add pre tag
2017-07-09php styleLloric Mayuga Garcia1-8/+8
Signed-off-by: Lloric Mayuga Garcia <emorickfighter@gmail.com>
2017-07-06[ci skip] Merge pull request #5173 from Syafiqq/developAndrey Andreev1-1/+1
Add array identifier for library loader docblock
2017-07-06Merge remote-tracking branch 'origin/develop' into developSyafiqq0-0/+0
# Conflicts: # system/core/Loader.php
2017-07-06Add array identifier for library loaderSyafiqq1-1/+1
2017-07-06[ci skip] Merge pull request #5170 from ↵Andrey Andreev2-3/+8
tianhe1986/develop_session_race_condition Decreasing the probability of race condition in session lock
2017-07-06Format fixing.tianhe19862-5/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-07-06Add array identifier for library loaderSyafiqq1-1/+1
2017-07-05Simplifying the code.tianhe19862-12/+6
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-07-05Acquiring memcached lock with add() to avoid race conditions.tianhe19861-2/+6
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-07-05Acquiring redis lock with existence check.tianhe19861-1/+10
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-26[ci skip] Merge pull request #5162 from hex-ci/patch-3Andrey Andreev1-1/+1
Fix a spelling typo in security docs
2017-06-25Fix the spelling of the word.Hex1-1/+1
2017-06-22Close #4134: Allow dots in alias names detected by QBAndrey Andreev3-12/+17
2017-06-22Implement #2436 (access to FV processed data)Andrey Andreev4-30/+64
2017-06-22[ci skip] Misc cleanup of CI_Email codeAndrey Andreev1-101/+64
2017-06-22[ci skip] Close #3711Andrey Andreev3-20/+15
2017-06-21Implement #193: Validating entire arrays in a single function callAndrey Andreev3-9/+20
2017-06-21[ci skip] Add changelog entry for PR #5159Andrey Andreev1-0/+1
2017-06-21Merge pull request #5159 from tianhe1986/develop_model_loadAndrey Andreev2-3/+23
Always check a model be a subclass of CI_Model when loaded
2017-06-21Add unit test.tianhe19861-1/+20
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-21Always check whether a model be a subclass of CI_Model when loaded.tianhe19861-2/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev13-78/+103
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.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
2017-06-19[ci skip] Starting 3.1.6-devAndrey Andreev6-4/+26
2017-06-19[ci skip] Prepare 3.1.5 releaseAndrey Andreev5-7/+7
2017-06-19[ci skip] Fix a bug in FV valid_email()Andrey Andreev3-3/+7
2017-06-15[ci skip] Add changelog entry for #5155Andrey Andreev1-0/+1
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev2-1/+11
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev2-1/+11
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET
2017-06-15Getting right num of rows with LIMIT usage.tianhe19862-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-15Revert "Ignore LIMIT when using CI_DB_query_builder::count_all_results"tianhe19861-21/+3
This reverts commit 9f6da3c2f11535fee09dd306ae6b884168e4623b. Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-15[ci skip] Merge pull request #5154 from angelxaces/patch-1Andrey Andreev1-1/+1
Grammatical fix in ancillary_classes.rst doc
2017-06-15[ci skip] Merge pull request #5154 from angelxaces/patch-1Andrey Andreev1-1/+1
Grammatical fix in ancillary_classes.rst doc
2017-06-15Adding unit test.tianhe19861-0/+10
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-15Ignore LIMIT when using CI_DB_query_builder::count_all_resultstianhe19861-3/+21
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-14Create ancillary_classes.rstAngel Aces1-1/+1
"Normally, to call any of the available CodeIgniter methods requires you to use the ``$this`` construct::" - Grammatical adjustment. It appears that the author meshed two sentences together by starting with the proper noun that they ended the previous sentence but as it is the sentence reads: "Normally to call any of the available. CodeIgniter methods requires..."
2017-06-13[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entryAndrey Andreev2-1/+2
2017-06-13[ci skip] Merge pull request #5150 from ↵Andrey Andreev1-1/+1
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns
2017-06-13[ci skip] Merge pull request #5150 from ↵Andrey Andreev1-1/+1
ytetsuro/add-oracle-rename-column-to-keyword Fix DBForge triggering ORA-00946 while renaming columns
2017-06-13add rename to keywordytetsuro1-1/+1
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev7-9/+9
Fix misc inconsistencies between code and doc comments
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev7-9/+9
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre7-9/+9
2017-05-25[ci skip] Fix #5131Andrey Andreev2-1/+2
2017-05-25[ci skip] Doc changes following PR #5130Andrey Andreev3-2/+6