started fixing the issue with searching and json. Fixed it for actors. In the middle of fixing the others. Need raymond's code
Results actor page is finished but will have to be fixed once the changes with the API is completed.
cleaning up past work
started fixing the issue with searching and json. Fixed it for actors. In the middle of fixing the others. Need raymond's code
Results actor page is finished but will have to be fixed once the changes with the API is completed.
cleaning up past work
Merge branch 'ellen/intergrate_api' of https://github.com/wheelerl1992/frankenstein into ellen/intergrate_api

Conflicts:
	frankenstein_mobile/api/frankenstein_serialization.py
	frankenstein_mobile/api/models.py
Raymnond and I fixed some of the json rendering. And I continued to work on the format of the results pages
working on results pages
Actor and Crew search works. Working on stage
Merge branch 'master' into ellen/intergrate_api

Conflicts:
	frankenstein_mobile/api/frankenstein_serialization.py
	frankenstein_mobile/frankenstein_site/settings.py
	frankenstein_mobile/frankenstein_site/views.py
	frankenstein_mobile/templates/frankenstein_mobile/results_actor.html
Fixing the formatting for a lot of the html stuff and fixed the views of everything. Playing around with clear views
Added a all results button and cleaned up the rest of the pages
Merge branch 'ellen/intergrate_api'

Conflicts:
	frankenstein_mobile/db.sqlite3