summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-07-09Merge pull request #5946 from sapics/travis/php74Andrey Andreev2-24/+75
Pass the travis php7.4 test
2020-04-13Add composer cache in Travissapics1-0/+4
2020-04-13Remove allow_failures of php7.4 in Travissapics1-1/+0
2020-04-13Fix error in Travis php7.4 testsapics1-1/+6
2020-04-13Remove deprecated option "dev"sapics1-1/+1
dev packages are installed by default now
2020-04-13Update Ubuntu from Trusty to Xenial on Travissapics1-22/+65
PHP7.4+ have less updates in Trusty on Travis
2020-04-06[ci skip] Merge pull request #5938 from taitomagatsu/fix-image-creation-from-pngAndrey Andreev1-2/+3
Fixed issue with creating a resource from png using Image_lib
2020-04-02Fixed issue with creating a resource from png using Image_libDiego1-2/+3
2020-03-30[ci skip] Merge pull request #5918 from wobility/patch-1Andrey Andreev1-0/+2
Update with heic format
2020-03-30[ci skip] Merge pull request #5895 from joshkel/pdo-db-closeAndrey Andreev1-0/+13
Fix database connection leak when closing PDO connection
2020-03-30[ci skip] Merge pull request #5907 from pkarunyu/developAndrey Andreev1-2/+2
Fixed double spacing in mimes.php
2020-03-30[ci skip] Merge pull request #5903 from achraf52/patch-2Andrey Andreev1-1/+1
Add HTTP/2.0 server protocol value variation
2020-02-29Update with heic formatWobility1-0/+2
Add heic and heif format for Apple file.
2020-02-15Fixed double spacing.Peter Karunyu1-2/+2
2020-02-10Add server protocol value variationAchraf Almouloudi1-1/+1
In some Apache servers running the HTTP/2 protocol, calling "$_SERVER['SERVER_PROTOCOL']" may return "HTTP/2.0" instead, thus causing CodeIgniter to (incorrectly) determine the output header protocol to use. This commit adds the different variation to fix that.
2020-01-28[ci skip] Merge pull request #5890 from jerkob/developAndrey Andreev2-0/+19
Adds a public trans_active function to determine transaction state
2020-01-28[ci skip] Merge pull request #5882 from adevesa/webp-permissionAndrey Andreev1-2/+2
image/webp upload type
2020-01-28Merge branch '3.1-stable' into developAndrey Andreev7-8/+62
Conflicts resolved: .travis.yml system/database/DB_query_builder.php system/helpers/captcha_helper.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Zip.php
2020-01-28[ci skip] Add comment about PR #5893 changesAndrey Andreev1-1/+2
2020-01-28Fix database connection leak when closing PDO connectionJosh Kelley1-0/+13
We discovered a resource leak (database connection leak) in our application's test suite. We investigated and discovered that, although the test suite was calling `CI_DB_driver::close()` after each test, the `result_id` member variable still maintained an internal reference to the database connection, which kept the connection from being closed. This is using pdo_sqlsrv; I have not tested other PDO drivers. Signed-off-by: Josh Kelley <joshkel@gmail.com>
2020-01-28Merge pull request #5893 from aitorres/developLonnie Ezell1-2/+2
ZIP Library Memory Optimization
2020-01-28Small tweak to `trans_active()` descriptionjerkob1-1/+1
2020-01-28Update docs for `trans_active()` function`jerkob1-5/+4
Per code review, update documentation from the proposed `trans_depth()` function to the replacement `trans_active()` function.
2020-01-28Replace `trans_depth()` with `trans_active()`jerkob1-4/+4
Per code review, replace `trans_depth()` function that returns the protected `_trans_depth` property with a `trans_active()` function that returns a boolean indicating whether a transaction is currently active.
2020-01-28Update Upload.phpDevesa Agustín1-1/+2
2020-01-27Merge pull request #5893 from aitorres/developLonnie Ezell1-2/+2
ZIP Library Memory Optimization
2020-01-27optimize memory allocation on zip libraryAndrés Ignacio Torres1-2/+2
Signed-off-by: Andrés Ignacio Torres <andresitorresm@gmail.com>
2020-01-27[ci skip] Merge pull request #5891 from franciscollanquipichun/developAndrey Andreev49-56/+56
Inserted required attribute `lang` in html tags
2020-01-27[ci skip] Add changelog entry for PR #5881Andrey Andreev1-0/+1
2020-01-27[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_joinAndrey Andreev2-2/+2
Added FULL OUTER JOIN to QueryBuilder
2020-01-27[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_joinAndrey Andreev2-2/+2
Added FULL OUTER JOIN to QueryBuilder
2020-01-27[ci skip] Merge pull request #5885 from etrianag/developAndrey Andreev1-2/+2
Update documentation for method parse_string
2020-01-27[ci skip] Merge pull request #5885 from etrianag/developAndrey Andreev1-2/+2
Update documentation for method parse_string
2020-01-27[ci skip] Add changelog entry for issue #5879Andrey Andreev1-0/+1
2020-01-27[ci skip] Fix #5879Andrey Andreev1-3/+3
2020-01-27[ci skip] Fix #5879Andrey Andreev1-3/+3
2020-01-27Remove parameter type from Description.etrianag1-1/+1
2020-01-27[ci skip] Add changelog for PR #5883Andrey Andreev1-0/+1
2020-01-27[ci skip] Merge pull request #5883 from adevesa/image_lib-webpAndrey Andreev2-0/+27
image/webp for Image lib
2020-01-25inserted required attribute in html tags in documentationFrancisco Javier Llanquipichun Garcia6-14/+14
Signed-off-by: Francisco Javier Llanquipichun Garcia <francisco.llanquipichun@gmail.com>
2020-01-25inserted required attribute in html tagFrancisco Javier Llanquipichun Garcia43-43/+43
Signed-off-by: Francisco Javier Llanquipichun Garcia <francisco.llanquipichun@gmail.com>
2020-01-24Add documentation for trans_depth functionjerkob1-0/+8
2020-01-24Add a trans_depth functionjerkob1-0/+12
Enables retrieval of the current _trans_depth
2020-01-23added FULL OUTER join option to documentationChristian Mohr1-1/+1
2020-01-14Update mimes.phpDevesa Agustín1-4/+3
2020-01-14Revert "Delete mimes.php"Devesa Agustín1-0/+185
This reverts commit 30e6bab491f3870d46af5f22432d829f083c3bd8.
2020-01-14Delete mimes.phpDevesa Agustín1-185/+0
2020-01-14Update Upload.phpDevesa Agustín1-1/+1
2020-01-14Update mimes.phpDevesa Agustín1-3/+3
2020-01-13Update documentation for method parse_stringetrianag1-2/+2
Fix description of parameter $template in method parse_string.