Merge branch 'master' of git.parisson.com:git/teleforma

diff --cc teleforma/admin.py
index 0942d260dedf2fed063761af3a621f87d3bc8738,aeae20b6e444ce9da11ccfc47d176886942b7145..51f35a3375ab03ebec52ebaa8f906738ddee0f7a
--- 1/teleforma/admin.py
--- 2/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -369,10 -391,11 +391,11 @@@ class ConferenceAdmin(admin.ModelAdmin)
      inlines = [MediaInline, ]
      exclude = ['readers']
      list_per_page = 30
 -    list_filter = ('course', 'period', 'date_begin', 'session')
 +    list_filter = ('course', 'period', 'date_begin', 'session', 'course_type')
      search_fields = ['public_id', 'id',
-                      'course__code', 'course__title', 'session',]
-     actions = [publish_conferences, ]
+                      'course__code', 'course__title', 'session']
+     actions = [publish_conferences, duplicate_conferences]
+     list_display = ['__str__', 'public_id', 'comment']
  
  
  class HomeAdmin(admin.ModelAdmin):