summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Collapse)AuthorFilesLines
2018-05-18http:// to https://Mehdi Bounya21-57/+57
2018-04-24[ci skip] Close #5479Andrey Andreev1-3/+3
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev1-2/+10
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-10[ci skip] Fix #5420Andrey Andreev1-2/+10
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-02-13only retain 103, 207, 308, 421 and 451qichengzx1-8/+0
2018-02-11complement the missing HTTP status codesqichengzx1-0/+13
2018-01-13[ci skip] Start 3.1.8-devAndrey Andreev1-1/+1
2018-01-13[ci skip] Prepare 3.1.7 releaseAndrey Andreev1-1/+1
2018-01-09[ci skip] Merge pull request #5376 from jim-parry/copyright-updateAndrey Andreev21-42/+42
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
2018-01-09Annual copyright updateMaster Yoda21-42/+42
2017-11-29[ci skip] Fix allow_get_array defaulting to FALSE if it doesn't existAndrey Andreev1-1/+1
2017-11-15Merge branch '3.1-stable' into developAndrey Andreev2-13/+7
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
2017-11-15Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332Andrey Andreev1-0/+8
2017-11-10Close #5330Andrey Andreev2-13/+7
2017-11-09Refactor CI_Config, CI_Hooks interaction (close #5323)Andrey Andreev2-17/+17
2017-11-06[ci skip] Merge pull request #5321 from PrestigeT/documentationAndrey Andreev1-1/+1
Fixed docblock on model function. Changed @param model from string to mixed
2017-11-02Fixed docblock on model function. Changed @param model from string to mixedAvrom1-1/+1
2017-09-25Merge branch '3.1-stable' into developAndrey Andreev1-37/+35
2017-09-25[ci skip] Mark the start of 3.1.7-devAndrey Andreev1-1/+1
2017-09-25[ci skip] Prepare 3.1.6 releaseAndrey Andreev1-1/+1
2017-08-05Minor change in _display() method in CI_Output class allowing us to override ↵Erik Nord1-2/+2
output data with an empty string. Without this change CI chooses to use the default "final_output" var; even though we passed an empty string to the method.
2017-07-06[ci skip] Merge pull request #5173 from Syafiqq/developAndrey Andreev1-1/+1
Add array identifier for library loader docblock
2017-07-06Add array identifier for library loaderSyafiqq1-1/+1
2017-06-28[ci skip] Remove redundant elses from CI_Loader::_ci_load_stock_library()Andrey Andreev1-8/+4
2017-06-28#5164 fix for stock librariesAndrey Andreev1-10/+11
2017-06-28Correct fix for #5164Andrey Andreev1-1/+1
894a3f2c9fe111af35dee4f5e8e711259b893fb6
2017-06-27Fix #5164Andrey Andreev1-20/+21
2017-06-21Always check whether a model be a subclass of CI_Model when loaded.tianhe19861-2/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev2-52/+45
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.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
2017-06-19[ci skip] Starting 3.1.6-devAndrey Andreev1-1/+1
2017-06-19[ci skip] Prepare 3.1.5 releaseAndrey Andreev1-1/+1
2017-06-05[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nitsAndrey Andreev3-3/+3
Fix misc inconsistencies between code and doc comments
2017-06-05Fix misc type inconsistencies between code and doc commentsTyson Andre3-3/+3
2017-05-25[ci skip] Fix #5131Andrey Andreev1-1/+1
2017-04-18[ci skip] Reduce nesting levels in CI_OutputAndrey Andreev1-51/+44
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev7-40/+44
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_test.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 user_guide_src/source/libraries/input.rst
2017-03-20[ci skip] Mark the start of 3.1.5-devAndrey Andreev1-1/+1
2017-03-20[ci skip] Prepare 3.1.4 releaseAndrey Andreev1-1/+1
2017-03-20Fix Apache header injection vulnerability in set_status_header()Andrey Andreev1-5/+5
2017-02-07Allow to omit trailing slash in config pathsvlakoff3-2/+16
2017-02-06[ci skip] Eliminate a needless array_merge() call from PR #5006 patchAndrey Andreev1-6/+3
2017-02-06Merge pull request #5006 from tianhe1986/develop_commonAndrey Andreev1-8/+8
Fix two bugs with Common Functions
2017-02-04Removing url encoded 127.tianhe19861-0/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-04Loading global mimes config file first, and then environment file.tianhe19861-8/+7
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-01Fix a CI_Input::set_cookie() bugAndrey Andreev1-9/+7
Found on StackOverflow: https://stackoverflow.com/questions/41925028/codeigniter-config-overrides-set-cookie-parameters
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-08 13:37:41 +0100