summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2017-08-31Refactoring some codeblocks.Andrei Rosseti1-26/+15
2017-08-30Fixed DBLIB subdriver to get the right version number of SQL Server.Andrei Rosseti1-0/+27
2017-08-29Optimize the join() type regexp and remove the extra leading space when no ↵Andrey Andreev1-3/+3
special join-type is used
2017-08-29Polish changes from & add changelog entry for PR #5242Andrey Andreev1-29/+8
Also, further simplified the join() logic
2017-08-29remove unnecessary empty linesShang Ning1-2/+0
2017-08-29add NATURAL JOIN types to fix #5240Shang Ning1-4/+20
2017-08-05Minor change in _display() method in CI_Output class allowing us to override ↵Erik Nord1-2/+2
output data with an empty string. Without this change CI chooses to use the default "final_output" var; even though we passed an empty string to the method.
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-06Add array identifier for library loaderSyafiqq1-1/+1
2017-07-06Format fixing.tianhe19862-5/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
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-22Close #4134: Allow dots in alias names detected by QBAndrey Andreev1-10/+13
2017-06-22Implement #2436 (access to FV processed data)Andrey Andreev1-29/+25
2017-06-22[ci skip] Misc cleanup of CI_Email codeAndrey Andreev1-101/+64
2017-06-22[ci skip] Close #3711Andrey Andreev1-16/+6
2017-06-21Implement #193: Validating entire arrays in a single function callAndrey Andreev1-8/+12
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 Andreev6-73/+58
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 Andreev1-1/+1
2017-06-19[ci skip] Prepare 3.1.5 releaseAndrey Andreev1-1/+1
2017-06-19[ci skip] Fix a bug in FV valid_email()Andrey Andreev1-2/+2
2017-06-15Merge pull request #5155 from tianhe1986/develop_count_ignore_limitAndrey Andreev1-1/+1
Fix CI_DB_query_builder::count_all_results() returning wrong count with LIMIT/OFFSET
2017-06-15Getting right num of rows with LIMIT usage.tianhe19861-1/+1
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-15Ignore LIMIT when using CI_DB_query_builder::count_all_resultstianhe19861-3/+21
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-13[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entryAndrey Andreev1-1/+1
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-05Fix misc type inconsistencies between code and doc commentsTyson Andre7-9/+9
2017-05-25[ci skip] Fix #5131Andrey Andreev1-1/+1
2017-05-25[ci skip] Doc changes following PR #5130Andrey Andreev1-1/+1
2017-05-25Merge pull request #5130 from aroche/patch-2Andrey Andreev1-7/+1
Allow arbitrary strings as extra attributes in form_label
2017-05-24fix bad attribute handling of form_labelaroche1-7/+1
When passing a string for extra attributes in form_label helper function, these attributes were skipped.
2017-05-21add pre tag in config and session when arrayLloric Mayuga Garcia1-2/+14
2017-05-10Merge pull request #5112 from cerealbeer/developAndrey Andreev1-1/+1
read() in DB_cache fails when catching E_WARNING with custom error handler
2017-05-10Removing the error suppression op from the file_get_contents() call.Giuseppe Marcelli1-1/+1
2017-05-10Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow ↵Giuseppe Marcelli1-1/+1
anymore to use the custom result object against cached database results, fixing this, for more info see issue 4665,1351" This reverts commit 8233b1d6fc56347195b3a0411806e197e2e59ad3.
2017-05-10Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to ↵Giuseppe Marcelli1-1/+1
use the custom result object against cached database results, fixing this, for more info see issue 4665,1351
2017-05-09read() in DB_cache does not fail when catching E_WARNING with custom error ↵Giuseppe Marcelli1-1/+1
handler
2017-05-09Merge pull request #5108 from ft23/patch-1Andrey Andreev1-0/+1
quizzes singular doesn't work
2017-05-06quizzes singular is doesnt work.Fatih Turan1-0/+1
2017-04-18[ci skip] Reduce nesting levels in CI_OutputAndrey Andreev1-51/+44
2017-04-18Merge pull request #5085 from jim-parry/fix/xmlrpcInstructor, Computer Systems Technology1-1/+1
Fix typo in serializeval()
2017-04-10Fix typo in serializeval()Master Yoda1-1/+1
Signed-off-by:Master Yoda <jim_parry@bcit.ca>