]> git.parisson.com Git - teleforma.git/commit
projects / teleforma.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf201b1 e65ebdc)
Merge branch 'no-telemeta' into feature/docker
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:51:55 +0000 (12:51 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:51:55 +0000 (12:51 +0200)
commit76f95200a7aac9b0c43d4abf959f3838a42b00f3
treefe523eab66c1f3dc96bf8cfe4e5a92a7491945cctree | snapshot
parentbf201b1cd3f072a2c28c21453db62a1816b15f02commit | diff
parente65ebdcd3a3f130ae1ae1c2a7986c684c84ad260commit | diff
Merge branch 'no-telemeta' into feature/docker
37 files changed:
.gitignore diff1 | diff2 | blob | history
requirements.txt diff1 | diff2 | blob | history
teleforma/admin.py diff1 | diff2 | blob | history
teleforma/exam/views.py diff1 | diff2 | blob | history
teleforma/forms.py diff1 | diff2 | blob | history
teleforma/models/crfpa.py diff1 | diff2 | blob | history
teleforma/south_migrations/0125_auto__add_mediatranscoded__chg_field_period_department__add_field_medi.py | | blob
teleforma/south_migrations/0126_auto__del_field_media_item.py | | blob
teleforma/static/teleforma/css/teleforma.css diff1 | diff2 | blob | history
teleforma/templates/postman/base.html diff1 | diff2 | blob | history
teleforma/templates/postman/view.html diff1 | diff2 | blob | history
teleforma/templates/registration/login.html diff1 | diff2 | blob | history
teleforma/templates/registration/registration_complete.html diff1 | diff2 | blob | history
teleforma/templates/registration/registration_corrector_complete.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/annals.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/appointments.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_conference.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_conference_audio.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_conference_record.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_document.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_media.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/course_media_video_embed.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/courses.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/courses_pending.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/inc/conference_list.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/inc/document_list.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/inc/media_list_pending.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/inc/newsitems_portlet.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/inc/user_list.html | diff2 | blob | history
teleforma/templates/teleforma/newsitem_list.html diff1 | diff2 | blob | history
teleforma/templates/teleforma/profile_detail.html | diff2 | blob | history
teleforma/templates/teleforma/search_criteria.html | diff2 | blob | history
teleforma/templates/teleforma/users.html | diff2 | blob | history
teleforma/views/core.py diff1 | diff2 | blob | history
teleforma/views/crfpa.py diff1 | diff2 | blob | history
teleforma/webclass/models.py diff1 | diff2 | blob | history
teleforma/webclass/templates/webclass/appointments.html diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.