Set proper Accept header for servers that attempt to honour them. #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 2e9f096.
This reverts commit 0300f70.
Small improvement to let user choose how to behave in case a file in a uploaded list is invalid: stop or skip and continue
Removed duplicate definition in README
added support for localizing 'is' and 'are' strings
…that is not shortened
Updated the ColdFusion code to allow for single file uploads via IE.
Fixed the ColdFusion code so it works with IE.
…nally minify all js files
… until 3.0 is released
added 21 commits
November 14, 2012 10:50
|
Could you rebase, please? |
|
What do you mean? |
|
pgraham, Github is saying "This pull request cannot be automatically merged." A rebase will probably fix this (a rebase updates your copy of the repository to the latest version and then applies your changes at the end) and allow us to accept your change cleanly. So instead of doing a "pull" (the same as fetch then merge), you do a fetch then "rebase". http://mettadore.com/analysis/a-simple-git-rebase-workflow-explained/ |
|
rebasing didn't work because the change I had made was to a file that no longer exists and merging makes this pull request rediculously complicated so I'm closing it and will open a new pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See discussion here: https://github.com/valums/file-uploader/issues/237#issuecomment-5336814