summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-10[ci skip] Merge pull request #5592 from Tusharmalik/developAndrey Andreev1-3/+3
corrected the serial number of 'source/installation/upgrade_319'
2018-09-10corrected the serial number of 'source/installation/upgrade_319' and changed ↵tusharmalik1-3/+3
the heading size
2018-09-05[ci skip] Merge pull request #5583 from johndekroon/developAndrey Andreev1-1/+2
Documented undocumented feature
2018-09-03Documented undocumented featureJohn de Kroon1-1/+2
The 'none' option is a valid option, which was documented in the 2.x documentation. I added it since it is still supported in 3.x.
2018-09-03Merge pull request #1 from bcit-ci/developJohn de Kroon214-496/+675
Update from source
2018-08-22[ci skip] Drop a dead return statementAndrey Andreev1-1/+0
2018-08-22[ci skip] Merge pull request #5570 from mfigueroa/patch-1Andrey Andreev1-2/+2
Fix grammar mistakes in cli.rst
2018-08-22[ci skip] Merge pull request #5568 from achraf52/patch-1Andrey Andreev1-1/+1
Corrected wrong "email" library link
2018-08-22[ci skip] Add exceptions for 2 error cases in FV set_rules()Andrey Andreev1-1/+2
2018-08-16Fix grammar mistakes in cli.rstManuel Figueroa1-2/+2
2018-08-15Update changelog.rstAchraf Almouloudi1-1/+1
2018-08-13Merge pull request #5566 from achraf52/patch-1Lonnie Ezell1-2/+2
Fixed typo in Encryption documentation
2018-08-13Update encryption.rstAchraf Almouloudi1-2/+2
2018-07-22[ci skip] Add changelog entry for PR #5531Andrey Andreev1-0/+1
2018-07-22Merge pull request #5531 from tianhe1986/develop_input_array_notationAndrey Andreev2-6/+38
Input: considering nested array keys in `get_post` and `post_get`
2018-06-26Using `isset`.tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-06-22Adding unit test.tianhe19861-0/+34
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-06-22Using null comparison instead of isset().tianhe19861-6/+4
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-06-15Merge branch '3.1-stable' into developAndrey Andreev2-4/+5
2018-06-15[ci skip] Fix #5526Andrey Andreev2-1/+4
2018-06-12Merge branch '3.1-stable' into developAndrey Andreev11-3/+133
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 Andreev6-4/+25
2018-06-12[ci skip] Prepare 3.1.9 releaseAndrey Andreev9-5/+104
2018-06-12[ci skip] Add a changelog entry for PR #5510Andrey Andreev1-0/+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-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-04[ci skip] Update upgrade instructions for PR #5512Andrey Andreev1-0/+7
2018-06-04[ci skip] Merge pull request #5512 from gxgpet/developAndrey Andreev1-1/+2
mimes.php: 7z file types changes
2018-06-04[ci skip] Merge pull request #5512 from gxgpet/developAndrey Andreev1-1/+2
mimes.php: 7z file types changes
2018-06-01Adding 7zip extension to mimes.phpGeorge Petculescu1-0/+1
Adding 7zip extension back as BC safety measure
2018-06-01[ci skip] Close #5482Andrey Andreev3-11/+25
2018-06-01[ci skip] Add changelog entry for #5516Andrey Andreev1-0/+1
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-06-01[ci skip] Merge pull request #5503 from mehdibo/http-to-httpsAndrey Andreev207-463/+463
http:// to https://
2018-06-01[ci skip] Merge pull request #5491 from jim-parry/niggly-sphinx-fixAndrey Andreev1-1/+1
Fix sphinx warning message
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-267zip mime typeGeorge Petculescu1-1/+1
renaming 7zip to 7z extension and adding one more mime id to it
2018-05-25Only use the output of idn_to_ascii() if it worked properlyJohn de Kroon2-3/+15
2018-05-18http:// to https://Mehdi Bounya207-463/+463
2018-05-02Fix sphinx warning messageMaster Yoda1-1/+1
2018-05-01[ci skip] Close #5487Andrey Andreev1-1/+1
2018-04-24[ci skip] Close #5479Andrey Andreev2-3/+12
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev5-5/+17
2018-04-24Fix test_like_set_side() unit test (dataProvider wasn't working)Andrey Andreev1-2/+2
2018-04-23[ci skip] Move changelog entry for PR #5391 from 3.1.8 to 3.1.9Andrey Andreev1-1/+4
Apparently I forgot to cherry-pick the actual change into 3.1-stable
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] Add changelog entry for PR #5471Andrey Andreev1-0/+3