Merge branch 'master' into feature/quiz

diff --cc app/settings.py
Simple merge

diff --cc teleforma/admin.py
Simple merge

diff --cc teleforma/models/core.py
index 5b055f50ce12ac765681709b5e3d1a8a1d9e8620,778af7d88bd1f0f3a9bc93152f5526d06087a9e7..57e4f4570a5a383ac5a639f78bd8dec160b8d7c6
mode 100755,100644..100644
--- 1/teleforma/models/core.py
--- 2/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@@ -53,16 -55,17 +55,18 @@@ from django.template.defaultfilters imp
  from django.urls import reverse_lazy, reverse
  from django.utils.translation import ugettext_lazy as _
  from django.db.models.signals import post_save
 -# from quiz.models import Quiz
 +from quiz.models import Quiz
 +from sorl.thumbnail import default as sorl_default
  
+ from teleforma.utils import guess_mimetypes
+ from ..fields import ShortTextField
+ 
+ from sorl.thumbnail import default as sorl_default
+ from pypdf import PdfWriter
  import httpx
  
- from ..fields import ShortTextField
+ from storages.backends.s3boto3 import S3Boto3Storage
  
- HAS_TELEMETA = False
- if 'telemeta' in settings.INSTALLED_APPS:
-     HAS_TELEMETA = True
  
  app_label = 'teleforma'
  

diff --cc teleforma/urls.py
index 8ab8ff6e91e9f10df8ba875380eb88cc843a839e,3d97a65fe2c0b54a1fb7ced24167f50ab3e09eb0..a2e996d84c102b936a2c6862b1e518921032f37d
--- 1/teleforma/urls.py
--- 2/teleforma/urls.py
+++ b/teleforma/urls.py
@@@ -61,9 -61,9 +61,9 @@@ from .views.crfpa import (AnnalsCourseV
                            CorrectorRegistrationPDFView,
                            CorrectorRegistrationPDFViewDownload,
                            CRFPAProfileView, NewsItemCreate, NewsItemDelete,
 -                          NewsItemList, NewsItemUpdate, ReceiptPDFView,
 +                          NewsItemList, NewsItemUpdate, QuizQuestionView, ReceiptPDFView,
                            ReceiptPDFViewDownload, RegistrationPDFView,
-                           RegistrationPDFViewDownload, UserAddView,
+                           RegistrationPDFViewDownload, RetractationView, UserAddView,
                            UserCompleteView, UserLoginView, UsersExportView,
                            UsersView, WriteView, update_training,
                            UserAddUseYourLawOriginView)
@@@ -180,9 -184,7 +184,9 @@@ urlpatterns = 
      url(r'^desk/documents/(?P<pk>.*)/view/$', document.view,
          name="teleforma-document-view"),
  
- 
 +    url(r'^desk/periods/(?P<period_id>.*)/quiz/(?P<quiz_name>[\w-]+)/$', QuizQuestionView.as_view(), name="teleforma-quiz"),
 +
+     # Annals
      url(r'^archives/annals/$', 
          AnnalsView.as_view(),
          name="teleforma-annals"),

diff --cc teleforma/views/crfpa.py
index 728081d557d5783383003eb1a0b3b84dc5774d08,f28fe8e7ab11b500ba9e8921388b9a70a8b196a3..e3bbad396007af57baf9432b4aecdfc267e44837
--- 1/teleforma/views/crfpa.py
--- 2/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@@ -58,10 -59,9 +59,10 @@@ from postman.forms import AnonymousWrit
  from postman.views import WriteView as PostmanWriteView
  from xlwt import Workbook
  from django.conf import settings
 +from quiz.views import QuizTake
  
  from ..decorators import access_required
- from ..forms import (CorrectorForm, NewsItemForm, UserForm, WriteForm,
+ from ..forms import (CorrectorForm, NewsItemForm, RetractationForm, UserForm, WriteForm,
                       get_unique_username, UserUseYourLawOriginForm)
  from ..models.core import Course, CourseType, Document, NamePaginator, Period
  from ..models.crfpa import (IEJ, Discount, NewsItem, Parameters, Payback,