summaryrefslogtreecommitdiffstats
path: root/application
AgeCommit message (Collapse)AuthorFilesLines
2019-10-08Merge pull request #5842 from sapics/chore/fix-indentAndrey Andreev1-3/+3
Fix indentation / clear whitespace
2019-10-05Update user_agents.phpOssama Mehmood1-0/+4
2019-09-25Fix indentsapics1-3/+3
2019-08-13[ci skip] Merge pull request #5815 from kamaslau/patch-2Andrey Andreev1-1/+1
Fix .aac file mime type
2019-08-11Fix .aac file mime typeKamas "Iceberg" Lau1-1/+1
2019-07-31Added some greek characters and corrected some of them that showed up wrongharrys.revis1-6/+17
2019-03-24Update user_agents.phpMuhammad Umer Farooq1-0/+1
2019-01-13Added mobile google bot to user agentsAlbert Leao1-0/+1
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
2018-08-22[ci skip] Close #5513Andrey Andreev1-1/+1
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-05-267zip mime typeGeorge Petculescu1-1/+1
renaming 7zip to 7z extension and adding one more mime id to it
2018-05-18http:// to https://Mehdi Bounya2-4/+4
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
2018-04-13[ci skip] Rename Spartan to Edge in config/user_agents.phpAndrey Andreev1-1/+1
#4354
2017-10-09[ci skip] Merge pull request #5292 from ajdunn2/developAndrey Andreev1-1/+1
Small spelling fix
2017-10-08Small spelling fixAJ Dunn1-1/+1
Missing ‘e’ in word ‘certificates’. Signed-off-by: AJ Dunn <andrew.dunn2@outlook.com.au>
2017-10-02[ci skip] Merge pull request #5281 from pawelkg/developAndrey Andreev1-2/+2
Adding some letters translated to Y in foregin_chars.php
2017-09-30Adding some letters translated to Y in foregin_chars.phpPaweł Kłopotek-Główczewski1-2/+2
Signed-off-by: Paweł Kłopotek-Główczewski <pawelkg@pawelkg.com>
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev1-6/+0
2017-07-03[ci skip] Drop application/cache/.htaccess; close #5169Andrey Andreev1-6/+0
2017-02-07Allow to omit trailing slash in config pathsvlakoff1-3/+3
2017-01-22Removed wrapper and changed mix cases usage of hex colorcodesDiederikLascaris6-274/+248
2017-01-22Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into developDiederikLascaris12-165/+103
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev2-15/+1
2016-12-14Remove 'global_xss_filtering' config settingAndrey Andreev1-14/+0
2016-12-14Remove 'allow_get_array', 'standardize_newlines' config settingsAndrey Andreev1-28/+0
2016-12-14Merge branch '3.1-stable' into developAndrey Andreev1-6/+16
2016-12-14[ci skip] Deprecate 'allow_get_array', 'standardize_newlines'Andrey Andreev1-6/+16
2016-12-12Remove previously deprecated Smiley HelperAndrey Andreev1-64/+0
2016-08-30Merge pull request #4788 from edtsz/patch-2Andrey Andreev1-1/+17
Add OpenOffice mime-types to config/mimes.php
2016-08-30OpenOffice mime-typesÉderson T. Szlachta1-1/+17
According to IANA media types : http://www.iana.org/assignments/media-types/media-types.xhtml
2016-05-26Merge pull request #4648 from el-ma/developAndrey Andreev1-1/+3
[ci skip] Add two more robots to config/user_agents.php
2016-05-26Update robots in config/user_agents.phpel-ma1-1/+3
Added Majestic-12 and Uptimebot
2016-05-25Merge pull request #4646 from el-ma/developAndrey Andreev1-1/+2
[ci skip] Add "Alexa Crawler" to robots
2016-05-25added "Alexa Crawler"el-ma1-1/+2
2016-02-15[ci skip] Polish changes from PR #4453Andrey Andreev1-2/+3
2016-02-15Merge pull request #4453 from EpicKris/feature/Autoload-Driver-Object-NameAndrey Andreev1-0/+5
Autoload Driver Object Names
2016-02-15[ci skip] Polish changes from PR #4453Andrey Andreev1-2/+3
2016-02-15Merge pull request #4453 from EpicKris/feature/Autoload-Driver-Object-NameAndrey Andreev1-0/+5
Autoload Driver Object Names
2016-02-15[ci skip] Add notes in config about CLI for url_suffix, permitted_uri_charsAndrey Andreev1-0/+4
2016-02-11Autoload Driver Object NamesKristian Matthews1-0/+5
Updated documentation for `$autoload['drivers']`. Updated loader to autoload drivers with object names the same as autoloading libraries. Signed-off-by: Kristian Matthews <kristian.matthews@me.com>
2016-01-13Merge pull request #4378 from jtneal/patch-1Andrey Andreev1-1/+1
[ci skip] Fix a defined() typo in config/constants.php
2016-01-13Fix type in default constants configurationJason Neal1-1/+1
The word "destructive" was misspelled in the conditional portion.
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev7-10/+10
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev7-10/+10
2016-01-11Merge pull request #4371 from feryardiant/contrib/mime-oggAndrey Andreev1-1/+1
[ci skip] Add extra mime for .ogg files
2016-01-11Merge pull request #4241 from suhindra/developAndrey Andreev1-1/+2
[ci skip] Added/updated MIME types for Flash Video