local changes from the server
authorJan Szejko <j-sz@o2.pl>
Thu, 11 Feb 2016 12:37:08 +0000 (13:37 +0100)
committerJan Szejko <j-sz@o2.pl>
Thu, 11 Feb 2016 12:37:08 +0000 (13:37 +0100)
commitfd65827f7d34921b927dfd735099b0690aa3a2df
treef98a618c7b0bcb7b456a087888cd1a291990c148
parent2e008ebe7ee77a359366823d1604e111fab98ca3
local changes from the server
71 files changed:
.gitignore
catalogue/models.py
catalogue/static/catalogue/css/carousel.css
catalogue/static/catalogue/css/carousel.scss
catalogue/templates/catalogue/lesson/added-var/lesson_detail.html [new file with mode: 0644]
catalogue/templates/catalogue/snippets/lesson_nav.html
catalogue/templates/catalogue/snippets/levels_main.html
catalogue/templatetags/catalogue_tags.py
curriculum/locale/pl/LC_MESSAGES/django.mo
curriculum/locale/pl/LC_MESSAGES/django.po
curriculum/templates/curriculum/competence_list.html
edumed/contact_forms.py
edumed/settings.d/50-static.py
edumed/static/css/form.css
edumed/static/css/form.scss
edumed/templates/base.html
edumed/templates/base_super.html
edumed/templates/contact/tem/mail_body.txt [new file with mode: 0755]
edumed/templates/contact/tem/mail_subject.txt [new file with mode: 0755]
edumed/templates/contact/tem/thanks.html [new file with mode: 0755]
edumed/templates/contact/wtem/form.html
edumed/templates/contact/wtem/mail_body.txt
edumed/templates/contact/wtem/mail_subject.txt
edumed/templates/contact/wtem/student_mail_body.html [new file with mode: 0644]
edumed/templates/contact/wtem/student_mail_subject.html [new file with mode: 0644]
edumed/templates/contact/wtem/thanks.html
edumed/templates/home.html
edumed/urls.py
wtem/admin.py
wtem/fixtures/exercises-2014.json [new file with mode: 0644]
wtem/forms.py
wtem/management/commands/__init__.py
wtem/management/commands/wtem_send_keys.py
wtem/management/commands/wtem_send_results.py
wtem/management/commands/wtem_send_results_csv.py [new file with mode: 0644]
wtem/migrations/0009_auto__add_field_attachment_tag.py [new file with mode: 0644]
wtem/models.py
wtem/templates/wtem-wtem/admin_report.csv [new file with mode: 0644]
wtem/templates/wtem-wtem/disabled_contact_form.html [new file with mode: 0644]
wtem/templates/wtem-wtem/email_key.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/email_key.txt.wtem [new file with mode: 0644]
wtem/templates/wtem-wtem/email_teacher_before.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/email_teacher_before_subject.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/edumed_prawdafalsz.html [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/edumed_przyporzadkuj.html [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/edumed_uporzadkuj.html [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/edumed_wybor.html [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/file_upload.html [new file with mode: 0644]
wtem/templates/wtem-wtem/exercises/open.html [new file with mode: 0644]
wtem/templates/wtem-wtem/key_not_found.html [new file with mode: 0644]
wtem/templates/wtem-wtem/key_not_found_before.html [new file with mode: 0644]
wtem/templates/wtem-wtem/main.html [new file with mode: 0644]
wtem/templates/wtem-wtem/main_after.html [new file with mode: 0644]
wtem/templates/wtem-wtem/main_before.html [new file with mode: 0644]
wtem/templates/wtem-wtem/results_student_failed.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/results_student_passed.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/results_teacher.txt [new file with mode: 0644]
wtem/templates/wtem-wtem/thanks.html [new file with mode: 0644]
wtem/templates/wtem/email_key.txt
wtem/templates/wtem/exercises/edumed_wybor.html
wtem/templates/wtem/exercises/file_upload.html
wtem/templates/wtem/exercises/open.html
wtem/templates/wtem/key_not_found.html
wtem/templates/wtem/key_not_found_before.html
wtem/templates/wtem/main.html
wtem/templates/wtem/main_after.html
wtem/templates/wtem/main_before.html
wtem/templates/wtem/results_student_failed.txt
wtem/templates/wtem/results_student_passed.txt
wtem/templates/wtem/results_teacher.txt
wtem/templates/wtem/thanks.html