Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-01-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 5 | -4/+48 | |
Conflicts resolved: system/core/CodeIgniter.php 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/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst | |||||
2017-01-10 | [ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1 | Andrey Andreev | 1 | -0/+4 | |
See #4967 | |||||
2017-01-10 | Add a testcase and changelog entry for #4975 | Andrey Andreev | 1 | -0/+4 | |
2017-01-09 | [ci skip] Mark the beginning of 3.1.4-dev | Andrey Andreev | 5 | -3/+25 | |
2017-01-09 | [ci skip] Prepare 3.1.3 release | Andrey Andreev | 3 | -4/+4 | |
2017-01-09 | Merge branch 'security' into 3.1-stable | Andrey Andreev | 1 | -0/+8 | |
2017-01-06 | [ci skip] Add changelog entry for PR #4825 | Andrey Andreev | 1 | -1/+5 | |
2017-01-06 | [ci skip] Add a changelog entry for #4765 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Add a changelog entry for #4457 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Add changelog entry for PR #4251 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Correct FV docs on valid_ip accepting a param | Andrey Andreev | 1 | -1/+1 | |
2017-01-06 | Add valid_mac() FV rule | Andrey Andreev | 2 | -0/+2 | |
Close #3992 | |||||
2017-01-06 | [ci skip] Add a changelog entry for #4963 | Andrey Andreev | 1 | -0/+1 | |
2017-01-06 | [ci skip] Add a changelog entry for #4962 | Andrey Andreev | 1 | -0/+1 | |
2017-01-04 | Close #4904 | Andrey Andreev | 2 | -4/+6 | |
2017-01-04 | Fix a possible file inclusion vulnerability in CI_Loader::vars() | Andrey Andreev | 1 | -0/+1 | |
2017-01-04 | [ci skip] Try to mitigate BREACH attacks against CSRF tokens | Andrey Andreev | 1 | -0/+1 | |
2017-01-04 | [ci skip] Protect CSRF verification from timing side-channel attacks | Andrey Andreev | 1 | -0/+1 | |
2017-01-04 | Fix an XSS vulnerability | Andrey Andreev | 1 | -0/+4 | |
2017-01-03 | [ci skip] Correct changelog entry for issue #4804, again | Andrey Andreev | 1 | -1/+1 | |
2017-01-03 | [ci skip] Correct changelog entry for issue #4804 | Andrey Andreev | 1 | -1/+1 | |
2017-01-03 | Fix #4804 | Andrey Andreev | 1 | -0/+1 | |
2017-01-03 | [ci skip] Add changelog entry for PR #4958 | Andrey Andreev | 1 | -0/+1 | |
2017-01-03 | [ci skip] Fix 4953 | Andrey Andreev | 1 | -0/+1 | |
2017-01-03 | [ci skip] Update year to 2017 in user_guide_src/cilexer | Andrey Andreev | 1 | -3/+3 | |
2017-01-03 | [ci skip] Update year to 2017 in user_guide_src/cilexer | Andrey Andreev | 1 | -3/+3 | |
2017-01-03 | Update copyright data to 2017 | Master Yoda | 2 | -3/+3 | |
2016-12-31 | Update copyright data to 2017 | Master Yoda | 2 | -3/+3 | |
2016-12-16 | Merge pull request #4947 from slax0rr/develop | Andrey Andreev | 2 | -6/+3 | |
[ci skip] Remove needless constructor in model general topics documentation | |||||
2016-12-16 | Add constructor comments to match controller docs | Tomaz Lovrec | 2 | -0/+3 | |
Empty constructors are pointless and bad practice, but removing them from this part of the documentation makes it less readable, makes less of a point, and would be quite frankly weird. Added a comment that suggests that further user code should be put there, like it is in the controller documentation | |||||
2016-12-16 | Remove needless constructor in model documentation | Tomaz Lovrec | 1 | -6/+0 | |
PHP will execute the parent constructor regardless if a constructor method is defined in the child class or not. Defining an empty constructor just to call the parents constructor can be considered bad practice. | |||||
2016-12-14 | Drop all PHP 5.3-related code | Andrey Andreev | 4 | -11/+7 | |
2016-12-14 | [ci skip] More doc changes related to PHP 5.4.8 requirement | Andrey Andreev | 6 | -20/+30 | |
2016-12-14 | [ci skip] Require PHP 5.4.8 as the absolute minimum | Andrey Andreev | 1 | -0/+4 | |
We stopped testing this branch on 5.3 long ago | |||||
2016-12-14 | [ci skip] Update changelog; add an entry & upgrade instructions for last commit | Andrey Andreev | 3 | -20/+52 | |
2016-12-14 | Finally drop CI_Input::_sanitize_globals() | Andrey Andreev | 2 | -23/+23 | |
Close #4101 | |||||
2016-12-14 | Remove 'global_xss_filtering' config setting | Andrey Andreev | 3 | -30/+10 | |
2016-12-14 | Remove 'allow_get_array', 'standardize_newlines' config settings | Andrey Andreev | 3 | -6/+7 | |
2016-12-14 | [ci skip] Fix a changelog entry typo | Andrey Andreev | 1 | -1/+1 | |
2016-12-14 | [ci skip] Fix a changelog entry typo | Andrey Andreev | 1 | -1/+1 | |
2016-12-14 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -0/+20 | |
2016-12-14 | [ci skip] Deprecate 'allow_get_array', 'standardize_newlines' | Andrey Andreev | 2 | -0/+16 | |
2016-12-12 | Remove previously deprecated Cart Library | Andrey Andreev | 4 | -415/+17 | |
2016-12-12 | Remove previously deprecated Smiley Helper | Andrey Andreev | 5 | -180/+14 | |
2016-12-12 | Fix #4892 - update_batch() | Andrey Andreev | 1 | -0/+1 | |
Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871 Supersedes #4929 | |||||
2016-12-12 | [ci skip] Add changelog entry for PR #4941 | Andrey Andreev | 1 | -0/+1 | |
2016-12-09 | [ci skip] Fix #4937 | Andrey Andreev | 1 | -0/+1 | |
2016-12-01 | [ci skip] Fix #4928 | Andrey Andreev | 1 | -0/+1 | |
2016-12-01 | [ci skip] Mark a historical docs note as written by EllisLab | Andrey Andreev | 1 | -1/+1 | |
2016-12-01 | Remove previously deprecated FV Library method/rule prep_for_form() | Andrey Andreev | 3 | -3/+4 | |