-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Develop #32
Open
danielgregorywilson
wants to merge
24
commits into
concentricsky:master
Choose a base branch
from
danielgregorywilson:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Develop #32
danielgregorywilson
wants to merge
24
commits into
concentricsky:master
from
danielgregorywilson:develop
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 copies in the jquery.init.js from Django and adds a line that un-namespaces jQuery so the same is used everywhere. This only works because the version of jQuery in Django 1.5 == 1.9.1, which is what we'd need in Client Admin.
Add GenericModelAdminMixin to Tabular and Stacked inlines to allow generic FK widgets in those inlines
…here are statuses to display.
… apply to children, with functionality for undoing the delete.
…lapsed when they start that way
…them collapsed when they start that way" This reverts commit 9b9f1c14fb3b0b04129a0f626fbfd406bca02053.
…s to look less janky
…o make word wraps, we could either insert soft hyphens or word break tags when we render text, or possibly use hyphenator.js (https://code.google.com/p/hyphenator/)
…ptions correctly; when any options are selected a link to remove that filter appears, which works by selecting the proper filter and removing it from the get request list, rather than just selecting the last one by default
… a width on field containers so that long CKEditor help text no longer forces it out of place
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.
Completed all CA tasks in backlog.