Upstream changes #1
Open
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
To support User models that don't provide an username field. Suggested by Josh Kelley. Fix #200
Bootstrap automatically adds dividers with a li+li ::before rule. Reported by by Josh Kelley. Fix #201
Add form-horizontal for right-justified field labels; pull help blocks into the same div as edit controls so they're aligned together.
Slightly normalized the file-upload widget. It looks like the actual button itself is inaccessible through css, so we may be stuck with the boring gray rectangle with sharp corners for the time being.
Major reworking of filter_horizontal widget making it looking a lot more integrated with the bootstrap theme.
We use glyphicons instead of old school gifs and add a bit of spacing. Still not that great looking.
It's breaking django js. This reverts commit 460a0ff.
We use glyphicons instead of old school gifs and add a bit of spacing. Look may not be great, we can improve by discriminating the widget. Not sure django is passing enough information to the template though.
Do for .pagination .this-page what bootstrap would do with its classes. Fix #207
We can avoid duplicating some html by moving it outside the if. While at it reduce one level of indentation. As seen in Bas Van Gaalen's fork.
And you shouldn't because it's unsupported! Fix #209
Django 1.8 ContentType has changed the behaviour of "name" and in some cases the previous version no longer returns a valid URL. The correct parameter to use for the Model name is the "model" parameter of the ContentType object.
For readability and consistency with other dropdown menus "welcome, user" and "recent actions", add extra space before caret in language selector menu
Add space before caret in language selector
Fix duplicate error messages in tabular inlines
Travis CI
Spotted by Jacek Wielemborek
That will cause the admin won't allow fieldsets display multiple fields on the same line in some rare situation, e.g. empty fields value for fieldset.
Fix suggested by hellpanderrr. Fix #233
help_text|safe bugfix for password fields
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.
No description provided.