summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
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-14[ci skip] Add changelog entry for #5462 (PR #5464)Andrey Andreev1-0/+1
2018-04-14Merge pull request #5464 from ytetsuro/fix/#5462/like-before-bugAndrey Andreev2-1/+24
Fixed issue #5462 Query Builder LIKE BEFORE doesnt work
2018-04-14Merge pull request #5464 from ytetsuro/fix/#5462/like-before-bugAndrey Andreev2-1/+24
Fixed issue #5462 Query Builder LIKE BEFORE doesnt work
2018-04-14fix: change to the old array() notationytetsuro1-6/+6
2018-04-13[ci skip] Rename Spartan to Edge in config/user_agents.phpAndrey Andreev1-1/+1
#4354
2018-04-13Fix #5448Andrey Andreev2-1/+6
2018-04-12qb_limit can be zeroJehong Ahn2-3/+3
2018-04-03feat: add test codeytetsuro1-0/+23
2018-04-03fix: It does not work properly when like is beforeytetsuro1-1/+1
2018-03-26[ci skip] Alter CI_Upload documentation on client_name (#5446)Andrey Andreev1-1/+1
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev12-39/+102
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 Andreev6-4/+26
2018-03-22[ci skip] Prepare 3.1.8 releaseAndrey Andreev4-5/+5
2018-03-15[ci skip] Merge pull request #5437 from MadGuyyy/developAndrey Andreev1-1/+1
Docs spelling fix: utlize -> utilize
2018-03-15[ci skip] Merge pull request #5437 from MadGuyyy/developAndrey Andreev1-1/+1
Docs spelling fix: utlize -> utilize
2018-03-15[ci skip] Add a changelog entry for PR #5431Andrey Andreev1-0/+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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-29 04:46:33 +0100