search

BerkeleyAutomation / malasakit

Malasakit is a customizable participatory assessment platform that collects and integrates quantitative assessment, qualitative feedback, and peer-to-peer collaborative filtering on ways local communities can become better prepared for typhoons and floods.
2 stars 8 forks source link

Tags #170

Closed ThanatchaPanpairoj closed 6 years ago

ThanatchaPanpairoj commented 6 years ago

Summary: The export to feature phone action on the web admin for quantitative questions will now support tranlations and anchor tags.

Testing: tested on local instance with standard web questions.

ThanatchaPanpairoj commented 6 years ago

I'm trying to fix the check that failed: "CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0061_auto_20171027_0812, 0060_auto_20171130_0904 in pcari). To fix them run 'python manage.py makemigrations --merge'"

I ran 'python manage.py makemigrations --merge' and it says 'No conflicts detected to merge.'

Any idea what the problem is?

jonathan-j-lee commented 6 years ago

Closing, since the scale from "disagree" to "agree" will be explained to listeners up-front.