Skip to content
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

Replace django-chartit with django-chartit2 #74

Merged
merged 3 commits into from
Apr 24, 2016
Merged

Conversation

rubik
Copy link
Contributor

@rubik rubik commented Apr 15, 2016

Submitting as a separate PR since it does not really have anything to do with datetimes.

@owocki
Copy link
Owner

owocki commented Apr 15, 2016

Seems fine to me. Anyone else?

@igorpejic
Copy link
Collaborator

igorpejic commented Apr 15, 2016

We should probably remove this ugly fix from the package source codes specific to django chartit:

sed -i 's/from django.utils import simplejson/import simplejson/' /usr/local/lib/python2.7/site-packages/chartit/templatetags/chartit.py

@rubik
Copy link
Contributor Author

rubik commented Apr 15, 2016

Yeah, that's no longer necessary. I'll update the PR.

@rubik
Copy link
Contributor Author

rubik commented Apr 15, 2016

Done.

@owocki
Copy link
Owner

owocki commented Apr 18, 2016

I'm good with merge here. @igorpejic @Snipa22 @t0mk ?

@owocki
Copy link
Owner

owocki commented Apr 23, 2016

seeing merge conflicts here. can you rebase or pull owocki/master into your branch so i can merge?

@rubik
Copy link
Contributor Author

rubik commented Apr 24, 2016

Sure, done.

@owocki owocki merged commit b110f3c into owocki:master Apr 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants