fix bug 767537 - inline diff in rss feed
Merge pull request #342 from groovecoder/revision-feed-diff-767537

fix bug 767537 - inline diff in rss feed
bug 762252: Disable NoCacheHttpsMiddleware to allow caching under HTTPS
bug 767537 - don't truncate tiny documents diffs
fix bug 765647: Properly handle "edit" button as translation request
Merge pull request #346 from lmorchard/edit-non-english-765647

fix bug 765647: Properly handle "edit" button as translation request
fix bug 770972 - Allow explicit assignment of discard_href
Wiki document admin improvements

* Allow the "Filter" sidebar to be collapsed, for when the changelist
  table is too wide for the browser.

* Combine many columns into single-column lists to make the changelist
  more horizonally compact
fix bug 768347: Templates should accept empty quoted parameters
Fixing slug for translations when a doc exists
Updating method by which updating slug
Updating tests

Fixing issue with permission and translation
fix bug 769786: Ignore trailing slash as part of legacy MT redirect logic
fix bug 769326: Legacy redirects for Project: and Project_talk: should expect locale in path
Merge pull request #347 from darkwing/edit-translation-slug

Fixing slug for translations when a doc exists
Merge pull request #355 from lmorchard/legacy-redirect-trailing-slash-769786

fix bug 769786: Ignore trailing slash as part of legacy MT redirect logic
Merge pull request #356 from lmorchard/project-redirect-769326

fix bug 769326: Legacy redirects for Project: and Project_talk: should expect locale in path
Merge
Merge pull request #349 from darkwing/translation-cancel-url-770972

fix bug 770972 - Allow explicit assignment of discard_href
Adjust the 'attachments' property of Documents to find all files.

This uses pretty simple logic to scan a Document's HTML for both
MindTouch and kuma file URL patterns, and then uses Q objects to build
a correct query to return the corresponding Attachment objects. If no
file URLs are found in the Document, it'll return an empty Attachment
queryset.

fix bug 770397 - Displaying attachments table under document and tags

fix bug 770563 - Show tags and file attachments regardless of TOC

Bugfix: actually wrap the file queries in Q objects.

Changing file URL method

Removing unnecessary filesize() method from AttachmentRevisions model

Fixing merge conflict
Add attachment admin and exempt files from locale prefixing.

The admin for attachments is pretty rudimentary, but should include
all the fields we care about; this will allow manual tinkering with
files as needed (particularly the mime-types, since that's the bit
most likely to cause problems).
Remove editable=False from AttachmentRevision.mime_type.