summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2015-05-06Merge pull request #3838 from mZer0ne/patch-5Andrey Andreev1-0/+1
Add Spartan to config/user_agents.php
2015-05-06Update user_agents.phpOleg Filippov1-0/+1
added new browser Spartan
2015-05-06update apc linkftwbzhao1-1/+1
2015-05-05[ci skip] Remove double description from composer.jsonAndrey Andreev1-1/+0
2015-05-04Renaming folders to directories :)Lonnie Ezell1-1/+1
2015-05-04[ci skip] Fix IRC link in composer.jsonAndrey Andreev1-1/+1
2015-05-04Keeping the user guide source out of the dist files.Lonnie Ezell1-0/+2
2015-05-04Merge branch 'develop' into attributesLonnie Ezell1-12/+11
2015-05-04Merge pull request #3829 from lonnieezell/developAndrey Andreev2-3/+23
[ci skip] Updating Project information and ignored files
2015-05-04Converting whitespace to tabs and removing issues linkLonnie Ezell1-12/+11
2015-05-04Ignore a number of files when using composer with --prefer-distLonnie Ezell1-0/+20
2015-05-04Should ignore PHPStorm and Sublime Text project files.Lonnie Ezell1-1/+12
2015-05-04Fleshing out the composer.json file with more basic info.Lonnie Ezell1-0/+10
2015-05-02[ci skip] Fix timezones list in date helper docsAndrey Andreev1-1/+1
Close #3818
2015-05-02[ci skip] Fix a doc link causing a Sphinx compile warningAndrey Andreev1-2/+2
2015-05-01Merge pull request #3825 from intekhabrizvi/developAndrey Andreev1-1/+1
MIMES : added new mime type for 3gp based video file upload
2015-05-01MIMES : added new mime type for 3gp based video file upload, added space ↵Intekhab Rizvi1-1/+1
between array
2015-05-01MIMES : added new mime type for 3gp based video file uploadIntekhab Rizvi1-1/+1
2015-04-30Fix #3823Andrey Andreev3-2/+3