summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-25Merge branch '3.1-stable'Andrey Andreev109-441/+750
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev4-5/+5
2017-09-25[ci skip] Add upgrade instructions about the APC deprecationAndrey Andreev1-0/+14
2017-09-25[ci skip] Fix potential object injection in apc cache driver; deprecate the ↵Andrey Andreev2-26/+27
apc driver
2017-09-16[ci skip] Merge pull request #5265 from mehdibo/patch-1Andrey Andreev1-1/+1
Fixed dbprefix() documentation
2017-09-13Fix #5260Andrey Andreev3-5/+63
2017-09-04Fix Travis-CI failuresAndrey Andreev1-0/+1
2017-09-04Fix #5246Andrey Andreev2-0/+2
2017-08-31[ci skip] Add changelog entry for #5243Andrey 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-25[ci skip] Fix #5236Andrey Andreev5-4/+5
2017-07-27Update composer.jsonInstructor, Computer Systems Technology1-1/+1
Replace IRC reference with Slack
2017-07-27Update readme.rstInstructor, Computer Systems Technology1-1/+1
2017-07-26[ci skip] Close #5206Andrey Andreev1-1/+1
2017-07-21[ci skip] Merge pull request #5188 from ↵Andrey Andreev1-4/+6
ryanbriscall/update-sphinx-version-userguide-src updates version of sphinx to 1.6.3 for easyinstall command in step 2 …
2017-07-21[ci skip] Merge pull request #5191 from jim-parry/patch/docsAndrey Andreev5-6/+8
Fix some mistakes in the user guide
2017-07-17[ci skip] escapeshellarg on the image src path passed to NetPBM by Image_libAndrey Andreev2-1/+2
2017-07-14[ci skip] Add changelog entry for #5183Andrey Andreev1-0/+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-10[ci skip] Fix #5178 (regression caused by #5168)Andrey Andreev1-1/+1
2017-07-10[ci skip] Add changelog entry for #5128Andrey Andreev1-0/+1
2017-07-10[ci skip] Merge pull request #5128 from lloricode/profiler-pre-tagAndrey Andreev1-2/+14
Profiler add pre tag
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] Add changelog entry for PR #5170Andrey Andreev1-0/+4
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-03[ci skip] Fix #5168Andrey Andreev2-8/+7
2017-07-03[ci skip] Drop application/cache/.htaccess; close #5169Andrey Andreev2-8/+2
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 Andreev2-11/+12
2017-06-28Correct fix for #5164Andrey Andreev1-1/+1
894a3f2c9fe111af35dee4f5e8e711259b893fb6
2017-06-27Fix #5164Andrey Andreev2-20/+26
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-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-15[ci skip] Merge pull request #5154 from angelxaces/patch-1Andrey Andreev1-1/+1
Grammatical fix in ancillary_classes.rst doc
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-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev7-9/+9
Fix misc inconsistencies between code and doc comments
2017-05-25[ci skip] Fix #5131Andrey Andreev2-1/+2
2017-05-25[ci skip] Doc changes following PR #5130Andrey Andreev3-2/+6
2017-05-25Merge pull request #5130 from aroche/patch-2Andrey Andreev1-7/+1
Allow arbitrary strings as extra attributes in form_label
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-09[ci skip] Add changelog entry for PR #5108Andrey Andreev1-0/+1
2017-05-09Merge pull request #5108 from ft23/patch-1Andrey Andreev1-0/+1
quizzes singular doesn't work
2017-04-18[ci skip] Reduce nesting levels in CI_OutputAndrey Andreev1-51/+44
2017-04-18[ci skip] Add changelog entry for #5084, PR #5085Andrey Andreev1-0/+1
2017-04-18Merge pull request #5085 from jim-parry/fix/xmlrpcInstructor, Computer Systems Technology1-1/+1
Fix typo in serializeval()