Create a new template tag called translate_url
Move the file browser url to i18n patterns
Use the new template tag for url generation
Add a given query string to url
Added two more HTML5 input types in dynamic_inline.js
dynamic_inline.js updated for HTML5 input types in Django 1.6
Added David Tomaschik to AUThORS
Don't hard code rss link url
Use FieldFile.url to get full image-url in gallery. Closes #877
SS: Bumped requests and requests-oauthlib versions.
Added Denis Cornehl to AUTHORS
fixed some pt-br typos
Fix tuple/list setting handling. Closes #883.
Merge
Merge
Added Luiz Felipe Schleder to AUTHORS
allow <a> tags inside <button> in TinyMCE
Add back bootstrap-extras.js. Menus stay open for a few hundred milliseconds after the cursor leaves them and the dropdowns in the main menu are useable when the menu is collapsed.

--HG--
branch : bs-extras
Merge
Merge