summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2018-06-15Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
2018-06-15[ci skip] Fix #5526Andrey Andreev1-1/+1
2018-06-12Merge branch '3.1-stable' into developAndrey Andreev6-1/+99
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Email.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
2018-06-12[ci skip] Mark the start of 3.1.10 developmentAndrey Andreev1-1/+1
2018-06-12[ci skip] Prepare 3.1.9 releaseAndrey Andreev6-1/+99
2018-06-12Merge pull request #5510 from johndekroon/developAndrey Andreev2-3/+15
Only use the output of idn_to_ascii() if it worked properly
2018-06-12[ci skip] Correct an erroneous variable name from PR #5510Andrey Andreev1-1/+1
2018-06-12Merge pull request #5510 from johndekroon/developAndrey Andreev2-3/+15
Only use the output of idn_to_ascii() if it worked properly
2018-06-11Fixing codestyleJohn de Kroon2-3/+3
2018-06-01[ci skip] Close #5482Andrey Andreev1-4/+4
2018-06-01Merge pull request #5516 from wpyh/patch-1Andrey Andreev1-3/+3
Use Config::base_url() properly
2018-06-01Merge pull request #5516 from wpyh/patch-1Andrey Andreev1-3/+3
Use Config::base_url() properly
2018-05-30Use Config::base_url() properlyWilliam Poetra Yoga1-3/+3
Using the Config::slash_item() method, we get double forward slashes. For example, base_url = 'http://localhost:8080/' and asset is '/assets/my_asset.css', then the generated URL would be 'http://localhost:8080//assets/my_asset.css'. This patch fixes that, so the generated URL would be 'http://localhost:8080/assets/my_asset.css'. There is actually already an analog example in the case if index_page === TRUE, where the site_url() function is used.
2018-05-25Only use the output of idn_to_ascii() if it worked properlyJohn de Kroon2-3/+15
2018-05-18http:// to https://Mehdi Bounya163-354/+354
2018-05-01[ci skip] Close #5487Andrey Andreev1-1/+1
2018-04-24[ci skip] Close #5479Andrey Andreev1-3/+3
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
2018-04-23Merge pull request #5391 from mehdibo/fix/url-helperAndrey Andreev1-1/+1
Prevent tab hijacking when using the URL helper
2018-04-23[ci skip] Merge pull request #5471 from toonitw/patch-1Andrey Andreev2-3/+3
The value of limit can be zero
2018-04-23[ci skip] Merge pull request #5471 from toonitw/patch-1Andrey Andreev2-3/+3
The value of limit can be zero
2018-04-18Remove the extra parenthesesJehong Ahn2-2/+2
2018-04-14Merge pull request #5464 from ytetsuro/fix/#5462/like-before-bugAndrey Andreev1-1/+1
Fixed issue #5462 Query Builder LIKE BEFORE doesnt work
2018-04-13Fix #5448Andrey Andreev1-1/+1
2018-04-12qb_limit can be zeroJehong Ahn2-3/+3
2018-04-03fix: It does not work properly when like is beforeytetsuro1-1/+1
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev6-32/+61
Conflicts resolved: system/core/CodeIgniter.php system/core/Security.php system/database/DB_query_builder.php system/libraries/Email.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
2018-03-22[ci skip] Mark the start of 3.1.9 developmentAndrey Andreev1-1/+1
2018-03-22[ci skip] Prepare 3.1.8 releaseAndrey Andreev1-1/+1
2018-03-15Merge pull request #5431 from CyberSecutor/developAndrey Andreev1-4/+6
Added parenthesis check around "document" elements and fixed non-existent document.window filter to window.document
2018-03-15Merge pull request #5431 from CyberSecutor/developAndrey Andreev1-4/+6
Added parenthesis check around "document" elements and fixed non-existent document.window filter to window.document
2018-03-15[ci skip] Fix #5435Andrey Andreev1-1/+14
2018-03-10[ci skip] Fix #5420Andrey Andreev1-2/+10
2018-03-10[ci skip] Merge pull request #5434 from xims/patch-3Andrey Andreev1-1/+4
Update Image_lib to avoid setting file permissions when not needed
2018-03-10[ci skip] Merge pull request #5434 from xims/patch-3Andrey Andreev1-1/+4
Update Image_lib to avoid setting file permissions when not needed
2018-03-08Update Image_lib to avoid setting file permissions when not neededxims1-1/+4
When processing an image, there is no need to set file permissions when using dynamic_output. In some cases, it floods the log file with errors ERROR --> Severity: Warning --> chmod(): Operation not permitted ...../CodeIgniter/libraries/Image_lib.php 838
2018-03-05Fixed typoRemko Silvis1-1/+1
2018-03-05Added parenthesis check around "document" elements and fixed non-existent ↵Remko Silvis1-3/+5
document.window filter to window.document
2018-03-04Fixed bug in ZIP libraryMehdi Bounya1-1/+1
the `read_dir` method ignores files that starts with a dot (like .htaccess) I looked through the documentation and it didn't mention that the method ignores hidden files so it must be a bug.
2018-02-28[ci skip] Fix #5425Andrey Andreev1-1/+1
2018-02-28[ci skip] Fix 5423Andrey Andreev1-4/+3
2018-02-14Merge pull request #5407 from qichengzx/developAndrey Andreev1-0/+5
complement the missing HTTP status codes
2018-02-14[ci skip] Apply #5394 (multibyte filename serving) to #5397 (Image_lib ↵Andrey Andreev1-1/+10
dynamic_output filename)
2018-02-14[ci skip] Merge pull request #5397 from mehdibo/patch-1Andrey Andreev1-1/+1
File name changing in dynamic output image_lib
2018-02-14Delete unnecessary assignment expressionsytetsuro1-1/+1
2018-02-13only retain 103, 207, 308, 421 and 451qichengzx1-8/+0
2018-02-13Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developqichengzx1-12/+3
2018-02-12Update Image_lib.phpMehdi Bounya1-1/+1
Fixed indentation
2018-02-12[ci skip] More polish on the download helperAndrey Andreev1-10/+3
2018-02-11complement the missing HTTP status codesqichengzx1-0/+13