summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2017-09-29Merge pull request #5278 from Uekawa/auto_linkAndrey Andreev1-1/+1
Fix auto_link trailing slash
2017-09-29Fix auto_linkUekawa1-1/+1
2017-09-27Fix #5276Andrey Andreev2-16/+4
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev12-82/+131
2017-09-25[ci skip] Mark the start of 3.1.7-devAndrey Andreev1-1/+1
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev1-1/+1
2017-09-25[ci skip] Fix potential object injection in apc cache driver; deprecate the ↵Andrey Andreev1-26/+22
apc driver
2017-09-13Fix #5260Andrey Andreev2-5/+61
2017-09-04Fix #5246Andrey Andreev1-0/+1
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
Fix for DBLIB subdriver to get the right version number of SQL Server.
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-25[ci skip] Fix #5236Andrey Andreev4-4/+4
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-26[ci skip] Close #5206Andrey Andreev1-1/+1
2017-07-17[ci skip] escapeshellarg on the image src path passed to NetPBM by Image_libAndrey Andreev1-1/+1
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] Fix #5178 (regression caused by #5168)Andrey Andreev1-1/+1
2017-07-10[ci skip] Merge pull request #5128 from lloricode/profiler-pre-tagAndrey Andreev1-2/+14
Profiler add pre tag
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-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-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-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-07-03[ci skip] Fix #5168Andrey Andreev1-8/+6
2017-06-28[ci skip] Remove redundant elses from CI_Loader::_ci_load_stock_library()Andrey Andreev1-8/+4
2017-06-28#5164 fix for stock librariesAndrey Andreev1-10/+11
2017-06-28Correct fix for #5164Andrey Andreev1-1/+1
894a3f2c9fe111af35dee4f5e8e711259b893fb6
2017-06-27Fix #5164Andrey Andreev1-20/+21
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