summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-12Merge pull request #757 from narfbg/2.1-stablePhil Sturgeon2-24/+83
Improve CI_Upload::_file_mime_type() realiability (2.1-stable)
2012-01-25strip base64 decoded file of special charsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-01-25allow client to overwrite filenameFlorian Pritz1-1/+12
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-26Merge pull request #709 from tubalmartin/2.1-stablePhil Sturgeon1-0/+14
2.1.0 - Fatal error: Call to undefined method CI_DB_Driver::_reset_select()
2011-12-20add Text::Markdown to install_helper.plFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18remove superfluous spaceFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18uplaod_from: fix feature description for binary filesFlorian Pritz1-1/+1
/ID/plain will work too. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18fix left over mime2extension call and commentsFlorian Pritz1-4/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18only calculate field lengths for cli clientsFlorian Pritz1-5/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18factorise mode detectionFlorian Pritz1-8/+36
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18improve readability of download()Florian Pritz1-13/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18use the same date for if-modified-since everywhereFlorian Pritz1-2/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18remove parameter of client()Florian Pritz1-4/+4
Parameters of controller functions are treated as url parameter so file/client/0 would also disable the headers. The cli client has empty headers anyway so just check that. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18fix missing space on upload_historyFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18ignore is_installed fileFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18display more information on delete_formFlorian Pritz3-5/+51
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-18add delete icon on upload_historyFlorian Pritz4-0/+76
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17install.php: lock after a successful runFlorian Pritz1-0/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17install.php: remove reference to db.sqlFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17mention install.php in INSTALLFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17use PATH in install.php; fix qrencode testFlorian Pritz1-6/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17use perl from PATH and copy markdown.pl to scripts/Florian Pritz3-6/+155
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17remove php code from upload_from.jsFlorian Pritz2-4/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17move JS of upload_form to separate fileFlorian Pritz3-65/+67
The code hardly changes so it should be cached by the browser. This won't work if it's inlined. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17use migrations; automatically set up the databaseFlorian Pritz5-55/+75
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17add short features description to upload_formFlorian Pritz2-1/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-17default.css: fix whitespacesFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-12-15Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stableAndrey Andreev2-1/+2
2011-12-14Merge pull request #766 from andrewmackrodt/2.1-stablePhil Sturgeon2-1/+2
Fixed issue #538: CI_Image_lib->new_image doesn't recognise backslashes
2011-12-13Tweak MIME regular expression check againAndrey Andreev1-1/+1
2011-12-11Updated changelog with fix for bug #538.Andrew Mackrodt1-0/+1
2011-12-11Fix regular expression for validating MIME type stringAndrey Andreev1-1/+1
2011-12-11Fix for Issue #538.Andrew Mackrodt1-1/+1
2011-12-09Update the ChangeLogAndrey Andreev1-0/+5
2011-12-09Improve CI_Upload::_file_mime_type()Andrey Andreev1-24/+78
2011-12-02Merge pull request #733 from narfbg/2.1-stable-upload-hotfixPhil Sturgeon2-3/+7
Hotfix for a bug in the Upload library
2011-12-02Update the change logAndrey Andreev1-1/+2
2011-12-02Update a comment, just to be clearerAndrey Andreev1-1/+1
2011-12-02Hotfix for a file type detection bug in the Upload libraryAndrey Andreev1-2/+5
2011-12-01Merge pull request #729 from Repox/2.1-stablePhil Sturgeon1-2/+8
This fixes issue #725
2011-12-01This fixes issue #725Repox1-2/+8
2011-11-28Merge commit 'v2.1.0'Florian Pritz64-496/+4293
Conflicts: user_guide/changelog.html user_guide/database/active_record.html user_guide/database/caching.html user_guide/database/call_function.html user_guide/database/configuration.html user_guide/database/connecting.html user_guide/database/examples.html user_guide/database/fields.html user_guide/database/forge.html user_guide/database/helpers.html user_guide/database/index.html user_guide/database/queries.html user_guide/database/results.html user_guide/database/table_data.html user_guide/database/transactions.html user_guide/database/utilities.html user_guide/doc_style/index.html user_guide/general/alternative_php.html user_guide/general/ancillary_classes.html user_guide/general/autoloader.html user_guide/general/caching.html user_guide/general/cli.html user_guide/general/common_functions.html user_guide/general/controllers.html user_guide/general/core_classes.html user_guide/general/creating_drivers.html user_guide/general/creating_libraries.html user_guide/general/credits.html user_guide/general/drivers.html user_guide/general/environments.html user_guide/general/errors.html user_guide/general/helpers.html user_guide/general/hooks.html user_guide/general/libraries.html user_guide/general/managing_apps.html user_guide/general/models.html user_guide/general/profiling.html user_guide/general/quick_reference.html user_guide/general/requirements.html user_guide/general/reserved_names.html user_guide/general/routing.html user_guide/general/security.html user_guide/general/styleguide.html user_guide/general/urls.html user_guide/general/views.html user_guide/helpers/array_helper.html user_guide/helpers/captcha_helper.html user_guide/helpers/cookie_helper.html user_guide/helpers/date_helper.html user_guide/helpers/directory_helper.html user_guide/helpers/download_helper.html user_guide/helpers/email_helper.html user_guide/helpers/file_helper.html user_guide/helpers/form_helper.html user_guide/helpers/html_helper.html user_guide/helpers/inflector_helper.html user_guide/helpers/language_helper.html user_guide/helpers/number_helper.html user_guide/helpers/path_helper.html user_guide/helpers/security_helper.html user_guide/helpers/smiley_helper.html user_guide/helpers/string_helper.html user_guide/helpers/text_helper.html user_guide/helpers/typography_helper.html user_guide/helpers/url_helper.html user_guide/helpers/xml_helper.html user_guide/images/appflowchart.gif user_guide/index.html user_guide/installation/downloads.html user_guide/installation/index.html user_guide/installation/troubleshooting.html user_guide/installation/upgrade_120.html user_guide/installation/upgrade_130.html user_guide/installation/upgrade_131.html user_guide/installation/upgrade_132.html user_guide/installation/upgrade_133.html user_guide/installation/upgrade_140.html user_guide/installation/upgrade_141.html user_guide/installation/upgrade_150.html user_guide/installation/upgrade_152.html user_guide/installation/upgrade_153.html user_guide/installation/upgrade_154.html user_guide/installation/upgrade_160.html user_guide/installation/upgrade_161.html user_guide/installation/upgrade_162.html user_guide/installation/upgrade_163.html user_guide/installation/upgrade_170.html user_guide/installation/upgrade_171.html user_guide/installation/upgrade_172.html user_guide/installation/upgrade_200.html user_guide/installation/upgrade_201.html user_guide/installation/upgrade_202.html user_guide/installation/upgrade_203.html user_guide/installation/upgrade_b11.html user_guide/installation/upgrading.html user_guide/libraries/benchmark.html user_guide/libraries/caching.html user_guide/libraries/calendar.html user_guide/libraries/cart.html user_guide/libraries/config.html user_guide/libraries/email.html user_guide/libraries/encryption.html user_guide/libraries/file_uploading.html user_guide/libraries/form_validation.html user_guide/libraries/ftp.html user_guide/libraries/image_lib.html user_guide/libraries/input.html user_guide/libraries/javascript.html user_guide/libraries/language.html user_guide/libraries/loader.html user_guide/libraries/output.html user_guide/libraries/pagination.html user_guide/libraries/parser.html user_guide/libraries/security.html user_guide/libraries/sessions.html user_guide/libraries/table.html user_guide/libraries/trackback.html user_guide/libraries/typography.html user_guide/libraries/unit_testing.html user_guide/libraries/uri.html user_guide/libraries/user_agent.html user_guide/libraries/xmlrpc.html user_guide/libraries/zip.html user_guide/license.html user_guide/nav/nav.js user_guide/overview/appflow.html user_guide/overview/at_a_glance.html user_guide/overview/cheatsheets.html user_guide/overview/features.html user_guide/overview/getting_started.html user_guide/overview/goals.html user_guide/overview/index.html user_guide/overview/mvc.html user_guide/toc.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-27Merge pull request #710 from johnnicely/2.1-stablePhil Sturgeon2-1/+2
Changed form_open() to compare $action against base_url().
2011-11-24Changed form_open() to compare $action against base_url()John Nicely2-1/+2
Checking for strpos($action, $CI->config->site_url()) === FALSE causes CSRF token to not be added in form_open() output. When site_url()'s first parameter ($uri) is empty, site_url's return value is the base URL plus the $CI->config->item('index_page') value. form_open() and CodeIgniter's URI routing do not require index.php to be in the URL, so any call to form_open() in which the $action parameter does not have index.php will always return false for the strpos() call.
2011-11-24Added dummy _reset_select() method to CI_DB_Driver class to allow Active ↵Túbal Martín1-0/+14
Record class to be disabled. Otherwise a fatal error is triggered.
2011-11-23Merge pull request #697 from MVUG/upload-fixes-2.1Phil Sturgeon3-3/+20
Fixed bug in Upload library tmp_path does not exists, should be tmp_name.
2011-11-23dutch typoMichiel Vugteveen1-1/+1
2011-11-23changelog updatedMichiel Vugteveen1-0/+17
2011-11-23tmp_path does not exists, should be tmp_nameMichiel Vugteveen1-1/+1
2011-11-23docx and xlsx have a zip/application mimetypeMichiel Vugteveen1-2/+2