]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/docker
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:34:10 +0000 (12:34 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:34:10 +0000 (12:34 +0200)
commitbf201b1cd3f072a2c28c21453db62a1816b15f02
treeb1abe9f150f729acf047fc757baab78173c0e0ae
parent453615eba28fd6e7759819c809e2f5be231d4b54
parentc6d4f080cee53c5b2003f92fe6dda67734bbe0fe
Merge branch 'dev' into feature/docker
26 files changed:
teleforma/admin.py
teleforma/exam/models.py
teleforma/exam/south_migrations/0006_auto__chg_field_script_mime_type__chg_field_scriptpage_mime_type.py
teleforma/models/crfpa.py
teleforma/south_migrations/0118_auto__add_field_training_platform_only__add_field_student_comment.py
teleforma/south_migrations/0119_auto__add_corrector.py
teleforma/south_migrations/0120_auto__add_field_profile_birthday_place__add_field_profile_ss_number.py
teleforma/south_migrations/0121_auto__add_field_student_balance_intermediary.py
teleforma/south_migrations/0122_auto__add_field_training_cost_elearning_fascicle__add_field_training_c.py
teleforma/south_migrations/0123_auto__add_field_training_duration.py
teleforma/south_migrations/0124_auto__add_field_student_receipt_id.py
teleforma/south_migrations/0125_auto__add_field_home_visible_title__chg_field_home_text.py
teleforma/south_migrations/0126_auto__add_field_profile_nationality.py
teleforma/templates/postman/base_folder.html
teleforma/templates/postman/base_write.html
teleforma/templates/postman/view.html
teleforma/templates/teleforma/appointments.html
teleforma/templates/teleforma/course.html
teleforma/templates/teleforma/course_conference.html
teleforma/templates/teleforma/course_detail.html
teleforma/templates/teleforma/courses.html
teleforma/templates/teleforma/inc/document_list.html
teleforma/templates/teleforma/inc/media_list.html
teleforma/templates/teleforma/inc/media_list_pending.html
teleforma/templates/telemeta/base.html
teleforma/templates/telemeta/profile_detail.html