summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-23Merge pull request #3924 from EdersonTS/patch-1Andrey Andreev1-1/+2
[ci skip] Add .ico mime type
2015-06-22Added .ico mime typeÉderson1-1/+2
Just added ico to mime list
2015-06-22[ci skip] Add remaining changes from PR #3826Andrey Andreev2-2/+2
2015-06-22A small optimization in CI_Cache::is_supported()Andrey Andreev1-3/+2
As it was, the static variable was always re-set to an empty array
2015-06-22Fix #3913Andrey Andreev3-139/+130
2015-06-22Work-around for https://bugs.php.net/bug.php?id=39598Andrey Andreev3-2/+43
Fixes #3922
2015-06-22Alter CI_Upload logging levelsAndrey Andreev2-24/+32
Close #3920
2015-06-19Merge pull request #3918 from SterlingVix/patch-2Andrey Andreev1-2/+2
[ci skip] Remove superfluous *Best Practices* parenthetical
2015-06-18Remove superfluous *Best Practices* parentheticalAaron Melocik1-2/+2
In the documentation at user_guide/general/security.html#best-practices, the 3-item list has a superfluous parenthetical that is also misplaced. This parenthetical currently is at the end of the first list item, though it refers to a step that can replace the first item. As per narfbg's request in PR https://github.com/bcit-ci/CodeIgniter/pull/3915, this change removes the parenthetical entirely. The change is: BEFORE: #. Validate the data to ensure it conforms to the correct type, length, size, etc. (sometimes this step can replace step one) #. Filter the data as if it were tainted. #. Escape the data before submitting it into your database or outputting it to a browser. AFTER: #. Validate the data to ensure it conforms to the correct type, length, size, etc. #. Filter the data as if it were tainted. #. Escape the data before submitting it into your database or outputting it to a browser.
2015-06-15Fix #3908Andrey Andreev1-1/+1
2015-06-13Merge pull request #3909 from MichaelFoss/patch-1Andrey Andreev1-1/+1
[ci skip] Fix a typo in url_title() docblock
2015-06-13Fix typo in url_title function description.Michael Foss1-1/+1
2015-06-11Fix #3904Andrey Andreev2-0/+7
2015-06-10Fix #3903Andrey Andreev2-3/+3
2015-06-08Fix #3890Andrey Andreev2-5/+14
2015-05-29[ci skip] Add a note to 3.0.0 upgrade instructionsAndrey Andreev1-3/+7
2015-05-27[ci skip] Remove 'global_xss_filtering' from CI_Security docsAndrey Andreev1-6/+0
2015-05-27[ci skip] Default 'db_debug' value to depend on ENVIRONMENT settingAndrey Andreev1-1/+1
Related: #3884
2015-05-26[ci skip] Improve 3.0 upgrade instructions renderingAndrey Andreev1-4/+4
Close #3876
2015-05-22Merge pull request #3868 from ftwbzhao/feature/migrationAndrey Andreev2-4/+4
[ci skip] Update Migration lib class reference docs
2015-05-21update function latestftwbzhao2-2/+2
2015-05-21[ci skip] Update tutorialAndrey Andreev2-52/+55
Related: #3866
2015-05-21Fix a bug in the CSV export DB utilityAndrey Andreev2-2/+3
Reported via the forums: http://forum.codeigniter.com/thread-61810.html
2015-05-21[ci skip] Trim some whitespace from Image_libAndrey Andreev1-11/+11
2015-05-20optimize migrations class referenceftwbzhao2-4/+4
2015-05-19Merge pull request #3865 from naghajani/developAndrey Andreev1-5/+5
[ci skip] Doc grammar fixes
2015-05-18Fixed some grammar.NAghajani1-5/+5
Fixed some grammar mistakes in image_lib.rst
2015-05-18[ci skip] Remove example usage of MD5 for passwordsAndrey Andreev1-3/+3
2015-05-18Merge pull request #3863 from tiagowbpr/developAndrey Andreev1-2/+2
[ci skip] Fix a doc example
2015-05-17param missing.Ticema1-2/+2
add param to do_upload() function.
2015-05-17Merge pull request #3861 from aanbar/update_mime_typesAndrey Andreev1-1/+3
Update mime types
2015-05-17Added subtitles mime types.Ahmad Anbar1-1/+3
2015-05-17Merge remote-tracking branch 'upstream/develop' into developAhmad Anbar42-111/+207
2015-05-13Merge pull request #3854 from leandrowkz/developAndrey Andreev2-1/+2
Fixed bug - using field_data() on Oracle databases
2015-05-13Update changelog.rstLeandro Mangini Antunes1-1/+1
2015-05-13Update changelog.rstLeandro Mangini Antunes1-0/+1
2015-05-13Merge pull request #3853 from ftwbzhao/feature/ci3.0Andrey Andreev1-3/+1
Minor adjustment for Redis Cache save function
2015-05-13Fixed bug - using field_data() on Oracle databasesLeandro Mangini Antunes1-1/+1
When you're using oracle databases and want to retrieve column information through the function field_data($table) you get the following notice: - Notice: Undefined property: stdClass::$COLUMN_DEFAULT in system/database/drivers/oci8/oci8_driver.php on line 576; This happens because the oci8 driver tries to access a property that does not exist on query used to get field information. Checking the code we see a small validation to set default value, but the variable $default is not used. So we fix this bug by simply changing: $retval[$i]->default = $query[$i]->COLUMN_DEFAULT; to $retval[$i]->default = $default; Bug fixed. No more notices and the properly value is set.
2015-05-13[Cache]minor adjustments for save functionftwbzhao1-3/+1
2015-05-13[ci skip] Fix an erroneous doc linkAndrey Andreev1-2/+2
Close #3851
2015-05-12Merge pull request #3842 from ftwbzhao/feature/lasttimeAndrey Andreev7-13/+14
[ci skip] Minor userguide corrections
2015-05-12Merge pull request #3831 from lonnieezell/attributesAndrey Andreev1-0/+22
GitAttributes file to clean up composer installs
2015-05-11Fix an undefined variable error from fbde2798688ab99cfe3fdd22746d60f0877b2c27Andrey Andreev1-1/+1
2015-05-11Merge pull request #3850 from RodolfoSilva/developAndrey Andreev1-0/+1
[ci skip] Add missing docs for 'regex_match' form validation rule
2015-05-11Adding validation not documented.Rodolfo Silva1-0/+1
2015-05-11Fix #3846Andrey Andreev2-6/+13
2015-05-08update userguideftwbzhao7-13/+14
2015-05-07Revert "Issue/PR #3836"Andrey Andreev2-7/+2
This reverts commit 170ae282338584ebe257d2fb21101ccf84a3f800.
2015-05-07Issue/PR #3836Andrey Andreev2-2/+7
2015-05-06Merge pull request #3835 from ftwbzhao/feature/userguideAndrey Andreev1-1/+1
[ci skip] Update APC section link