git.parisson.com Git - teleforma.git/commit

]> git.parisson.com Git - teleforma.git/commit

projects / teleforma.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0c0fe28 74a680d)

author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 11 May 2021 07:44:35 +0000 (09:44 +0200)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 11 May 2021 07:44:35 +0000 (09:44 +0200)
commit	12d7e9ad7fc90bd46858e62df663939b988f532c
tree	541e41f038f8de45cf4f97191756b56204c14606	tree \| snapshot
parent	0c0fe282c58e690f4b6dc988b665a6b6b5f97537	commit \| diff
parent	74a680df3c2dfb87e8c9f36e5221410b61898e61	commit \| diff

Merge branch 'no-telemeta' into feature/docker

17 files changed:

teleforma/admin.py	diff1 \|	diff2 \|	blob \| history
teleforma/models/crfpa.py	diff1 \|	diff2 \|	blob \| history
teleforma/south_migrations/0127_auto__add_field_profile_siret.py	\|	\|	blob
teleforma/south_migrations/0128_auto__add_field_appointmentperiod_course__add_field_appointmentperiod_.py	\|	\|	blob
teleforma/south_migrations/0129_auto__del_field_appointmentperiod_bbb_room__add_field_student_restrict.py	\|	\|	blob
teleforma/south_migrations/0130_auto__add_field_payment_date_paid.py	\|	\|	blob
teleforma/south_migrations/0131_auto__add_mediatranscoded__chg_field_period_department__add_field_medi.py	\|	\|	blob
teleforma/south_migrations/0132_auto__del_field_media_item.py	\|	\|	blob
teleforma/static/teleforma/css/teleforma.css	diff1 \|	diff2 \|	blob \| history
teleforma/templates/registration/registration_complete.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_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/inc/conference_list.html	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.