summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-09-16[ci skip] Merge pull request #5265 from mehdibo/patch-1Andrey Andreev1-1/+1
2017-09-16Fixed dbprefix()Mehdi Bounya1-1/+1
2017-09-04Fix Travis-CI failuresAndrey Andreev1-0/+1
2017-08-31Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-versionAndrey Andreev1-0/+16
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 sp...Andrey Andreev1-3/+3
2017-08-29Polish changes from & add changelog entry for PR #5242Andrey Andreev2-29/+9
2017-08-29Merge pull request #5242 from jvyyuie/naturalAndrey Andreev1-4/+18
2017-08-29remove unnecessary empty linesShang Ning1-2/+0
2017-08-29add NATURAL JOIN types to fix #5240Shang Ning1-4/+20
2017-08-07[ci skip] Update docs & add changelog entry for PR #5217Andrey Andreev2-1/+2
2017-08-07Merge pull request #5217 from erkaperka/developAndrey Andreev1-2/+2
2017-08-05Minor change in _display() method in CI_Output class allowing us to override ...Erik Nord1-2/+2
2017-07-27Update composer.jsonInstructor, Computer Systems Technology1-1/+1
2017-07-27Update readme.rstInstructor, Computer Systems Technology1-1/+1
2017-07-21[ci skip] Merge pull request #5188 from ryanbriscall/update-sphinx-version-us...Andrey Andreev1-4/+6
2017-07-21[ci skip] Merge pull request #5191 from jim-parry/patch/docsAndrey Andreev5-7/+8
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-20[ci skip] Fix changelog entries (errors detected while testing #5188)Andrey Andreev1-2/+2
2017-07-17updates prerequisites text to clarify v2.7 requirement of Python for Sphinx.ryanbriscall1-3/+5
2017-07-16updates version of sphinx to 1.6.3 for easyinstall command in step 2 of user_...ryanbriscall1-1/+1
2017-07-14[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_typeAndrey Andreev1-1/+1
2017-07-13add is_write_type method for merge queryytetsuro1-1/+1
2017-07-10[ci skip] Merge pull request #5128 from lloricode/profiler-pre-tagAndrey Andreev1-2/+14
2017-07-09php styleLloric Mayuga Garcia1-8/+8
2017-07-06[ci skip] Merge pull request #5173 from Syafiqq/developAndrey Andreev1-1/+1
2017-07-06Merge remote-tracking branch 'origin/develop' into developSyafiqq0-0/+0
2017-07-06Add array identifier for library loaderSyafiqq1-1/+1
2017-07-06[ci skip] Merge pull request #5170 from tianhe1986/develop_session_race_condi...Andrey Andreev2-3/+8
2017-07-06Format fixing.tianhe19862-5/+3
2017-07-06Add array identifier for library loaderSyafiqq1-1/+1
2017-07-05Simplifying the code.tianhe19862-12/+6
2017-07-05Acquiring memcached lock with add() to avoid race conditions.tianhe19861-2/+6
2017-07-05Acquiring redis lock with existence check.tianhe19861-1/+10
2017-06-26[ci skip] Merge pull request #5162 from hex-ci/patch-3Andrey Andreev1-1/+1
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
2017-06-21Add unit test.tianhe19861-1/+20
2017-06-21Always check whether a model be a subclass of CI_Model when loaded.tianhe19861-2/+3
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev13-78/+103
2017-06-19[ci skip] Starting 3.1.6-devAndrey Andreev6-4/+26