Merge branch 'develop' into feature/3190_remove_esprit

.gitignore

@@ -11,7 +11,11 @@ src*
 build/*
 dist/*
 tmp/*
+
 *.zip
+!doajtest/unit/resources/*.zip
+!doajtest/preservation_upload_test_package/*.zip
+
 scratch.py
 .coverage
 htmlcov/*

cms/data/ambassadors.yml

@@ -62,13 +62,6 @@
   photo: "ivonne.jpg"
   coi:
     2022: https://drive.google.com/file/d/1HnGhYbvbzL34guWOmIqcthcwAN8NADX1/view?usp=sharing
-
-- name: John G. Dove
-  region: North America
-  bio: "John has had a career in executive management, and is now an independent consultant and open access advocate who works with organisations seeking to accelerate their transition to open access.  He advises both for-profits and non-profits, and has a particular interest in identifying the steps necessary to flip an entire discipline’s scholarly record to open access. His ambassador activities focus on increasing the support to DOAJ from the community. He served for six years on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and has written for <a href='https://onlinelibrary.wiley.com/doi/10.1002/leap.1086' target='_blank'>Learned Publishing</a>, <a href='https://against-the-grain.com/2011/12/v23-5-atg-interviews-john-g-dove-president-credo-reference/' target='_blank'>Against the Grain</a>, and <a href='https://scholarlykitchen.sspnet.org/2019/11/07/guest-post-transparency-what-can-one-learn-from-a-trove-of-invoices/' target='_blank'>Scholarly Kitchen</a>. John serves on the Board of Trustees of his local public library in Revere, Massachusetts. He has a B.A. in Mathematics from Oberlin College."
-  photo: "johndove.jpg"
-  coi:
-    2022: https://drive.google.com/file/d/1cWijl2xdmVjshsvaGTABOvC_chIIfuVA/view?usp=sharing
 
 - name: Mahmoud Khalifa
   region: Middle East and Persian Gulf

cms/data/nav.yml

@@ -56,11 +56,11 @@ entries:
     secondary_mobile: true
     route: doaj.support               # ~~->Support:WebRoute~~
     entries:
-      - label: Support DOAJ
+      - label: Institutions and libraries
         route: doaj.support           # ~~->Support:WebRoute~~
-      - label: Publisher supporters
+      - label: Publishers
         route: doaj.publisher_supporters      # ~~->PublisherSupporters:WebRoute~~
-      - label: Supporters
+      - label: Institutional and library supporters
         route: doaj.supporters        # ~~->Supporters:WebRoute~~
   - id: apply
     label: Apply

cms/data/sponsors.yml

@@ -1,25 +1,22 @@
 # List of sponsors separated by tiers (premier, sustaining, basic)
 # ~~Sponsors:Data~~
 
-gold:
 - name: Royal Society of Chemistry
   url: https://www.rsc.org/
   logo: rsc.png
-  
+
 - name: Georg Thieme Verlag KG
   url: https://www.thieme.com/
   logo: thieme.svg
 
-
-silver:
 - name: AOSIS
   url: https://aosis.co.za/
   logo: aosis.png
 
 - name: Cappelen Damm Akademisk
   url: https://www.cappelendammundervisning.no/
   logo: cda.jpg
-  
+
 - name: Copernicus Publications
   url: https://publications.copernicus.org
   logo: copernicus.svg
@@ -31,7 +28,7 @@ silver:
 - name: Frontiers
   url: https://www.frontiersin.org/
   logo: frontiers.svg
-  
+
 - name: Knowledge E
   url: https://knowledgee.com/
   logo: knowledgee.png
@@ -43,29 +40,27 @@ silver:
 - name: OA.Works
   url: https://oa.works/
   logo: oaworks.png
-  
+
 - name: SAGE Publishing
   url: https://www.sagepublications.com/
   logo: sage.svg
 
 - name: Taylor & Francis Group
   url: https://www.taylorandfrancisgroup.com/
   logo: tf.svg  
-  
+
 - name: John Wiley and Sons LTD
   url: https://www.wiley.com/en-us 
   logo: Wiley_Wordmark_black.png
 
-
-bronze:
 - name: American Chemical Society
   url: https://pubs.acs.org/
   logo: acs.jpg
-  
+
 - name: American Psychological Association
   url: https://www.apa.org/pubs
   logo: apa.png
-  
+
 - name: Cambridge University Press
   url: https://www.cambridge.org/
   logo: cambridge.svg
@@ -74,30 +69,34 @@ bronze:
   url: https://www.digital-science.com/
   logo: ds.svg
 
+- name: De Gruyter
+  url: https://www.degruyter.com/
+  logo: Degruyter.svg
+
 - name: eLife Sciences Publications
   url: https://elifesciences.org/
   logo: elife.svg
 
 - name: Elsevier
   url: https://www.elsevier.com/
   logo: elsevier.svg
-  
+
 - name: Emerald Publishing
   url: https://emeraldpublishing.com/
   logo: emerald.svg
 
 - name: IEEE
   url: https://www.ieee.org/
   logo: ieee.png
-  
+
 - name: Institute of Physics
   url: https://www.iop.org/
   logo: iop.jpg
-  
+
 - name: International Union for Conservation of Nature
   url: https://iucn.org/
   logo: IUCN.svg
-  
+
 - name: JMIR Publications
   url: https://jmirpublications.com/
   logo: jmir.svg
@@ -129,12 +128,11 @@ bronze:
 - name: SciFree
   url: https://scifree.se/
   logo: scifree.svg
-  
+
 - name: The IET
   url: https://www.theiet.org/
   logo: iet.svg
 
 - name: Ubiquity Press
   url: https://www.ubiquitypress.com/
-  logo: ubiquity.svg  
-
+  logo: ubiquity.svg