toggle on legend, streak progress, attempts.  Note inline javascript; I don't know how to do otherwise yet :(
toggle on legend, streak progress, attempts.  Note inline javascript; I don't know how to do otherwise yet :(
Merge branch 'printable_coach_reports' of github.com:bcipolli/ka-lite into printable_coach_reports
poor man's way of reverting
poor man's way of reverting
Merge branch 'printable_coach_reports' of github.com:bcipolli/ka-lite into printable_coach_reports

Conflicts:
	kalite/securesync/management/commands/generatefakedata.py
removing debug code
moved javascript to end of file, added translate tag (randomly)
Merge remote-tracking branch 'origin/fake_video_data' into printable_coach_reports

Conflicts:
	kalite/securesync/management/commands/generatefakedata.py
get video content to show
small updates per Jamie's comments
small updates per Jamie's comments
Merge branch 'urls' of github.com:bcipolli/ka-lite into urls

Conflicts:
	kalite/registration/models.py
no request object for registrations, so I create one.  There must be a way to get ahold of one, but I don't know it...
migrating to schema that can be used in the future
hot bugfixes and small context_instance handling issues
Merge branch 'urls' into user_activity_logs
Merge branch 'user_activity_logs' into summary_stats_totaltime
updating logs to follow new UserLog schema
fixed small bug when ending a previous log entry when requested to begin a new one