Merge pull request #209 from EsupPortail/dev

Dev
EsupPortail · Feb 4, 2020 · 3583768 · 3583768
2 parents 177befd + 57a8fc0
commit 3583768
Show file tree

Hide file tree

Showing 132 changed files with 4,158 additions and 3,461 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ Icon?
 # Custom files  #
 #################
 import_data/
+log/
 media/
 pod/*/migrations/
 pod/custom/*

diff --git a/.travis.yml b/.travis.yml
@@ -24,11 +24,11 @@ install:
     - pip install flake8
 before_script:
     - sleep 10
-    - "flake8 --max-complexity=7 --exclude .git,pod/*/migrations/*.py"
+    - "flake8 --max-complexity=7 --exclude .git,pod/*/migrations/*.py,test_settings.py"
 # command to run tests
 script:
     - python manage.py create_pod_index
     - python manage.py makemigrations
     - python manage.py migrate
-    - python manage.py test
+    - python manage.py test --settings=pod.main.test_settings
 #  - pytest # or py.test for Python versions 3.5 and below
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -14,6 +14,6 @@ A list of much-appreciated contributors who have submitted patches and reported
 * Frédéric Colau, Eliam Lotonga and Jeremie Grepilloux, University Grenoble Alpes
 * Loic Bonavent, University of Montpellier
 * Guillaume Condesse, University of Bordeaux
-* Franck Charneau and Joshua Baudry, University of La Rochelle
+* Franck Charneau and Joshua Baubry, University of La Rochelle
 * Nicolas Lahoche, University of Lille (design and template)
 * Charlotte Benard (Logo and color)
diff --git a/docs/configuration.md b/docs/configuration.md
diff --git a/docs/index.md b/docs/index.md
@@ -1,8 +1,6 @@
 # Plateforme Pod : Gérez vos vidéos
 
-## [Installation de la plateforme](installation.md "Installation de la plateforme Pod")
-## [Configuration de la plateforme](configuration.md "Configuration de la plateforme Pod")
-
+## Retrouvez toute la documentation à cette adresse : https://www.esup-portail.org/wiki/display/ES/esup-pod
 
 
 [<img src="https://www.univ-lille.fr/typo3conf/ext/ul2fpfb/Resources/Public/assets/img/UL-ROSE-dark-2014.svg" height="50" >](https://www.univ-lille.fr "Université de Lille") | [<img src="https://www.esup-portail.org/sites/default/files/logo-esupportail_1.png" height="50" >](https://www.esup-portail.org "Esup Portail") | [<img src="http://cache.media.enseignementsup-recherche.gouv.fr/image/Global/35/8/Marianne_seule_MESRI_head_www_766358.jpg" height="50" > Ministère de lʼEnseignement supérieur, de la Recherche et de lʼInnovation](http://www.enseignementsup-recherche.gouv.fr "Ministère de lʼEnseignement supérieur, de la Recherche et de lʼInnovation")