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

Feature/du574 remove sms #577

Merged
merged 5 commits into from
May 26, 2014

Conversation

zzgvh
Copy link
Contributor

@zzgvh zzgvh commented May 26, 2014

No description provided.

@KasperBrandt
Copy link
Contributor

And there's no migration file, probably forgot to add that to the commit?

@KasperBrandt KasperBrandt self-assigned this May 26, 2014
@zzgvh
Copy link
Contributor Author

zzgvh commented May 26, 2014

Yep, good call on rsr.SmsReporter.

zzgvh added 4 commits May 26, 2014 14:20
The migration deletes the SmsReporter model and the phone_number and
validation fields of the UserProfile.

Also remove the fixture that was only populating models used by the SMS
models.
…e_sms

Conflicts:
	akvo/templates/notification/notice_settings.html
	akvo/templates/rsr/myakvo/navigation.html
KasperBrandt added a commit that referenced this pull request May 26, 2014
@KasperBrandt KasperBrandt merged commit 78dc6e2 into feature/django-upgrade May 26, 2014
@adriancollier adriancollier added this to the 2.3.8 Xylocarp milestone Jun 3, 2014
@osg74 osg74 deleted the feature/du574_remove_sms branch June 10, 2014 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants