Merge branch 'develop' of https://github.com/DOAJ/doaj into feature/3…

…689_kafka_fallback

# Conflicts:
#	portality/util.py

.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/nav.yml

@@ -27,7 +27,7 @@ entries:
         route: doaj.openurl           # ~~->OpenURLDocumentation:WebRoute~~
       - label: XML
         route: doaj.xml               # ~~->XMLDocumentation:WebRoute~~
-      - label: FAQs
+      - label: Metadata help
         route: doaj.faq               # ~~->FAQ:WebRoute~~
   - id: about
     label: About
@@ -60,7 +60,7 @@ entries:
         route: doaj.support           # ~~->Support:WebRoute~~
       - label: Publishers
         route: doaj.publisher_supporters      # ~~->PublisherSupporters:WebRoute~~
-      - label: Supporters
+      - label: Institutional and library supporters
         route: doaj.supporters        # ~~->Supporters:WebRoute~~
   - id: apply
     label: Apply
@@ -77,8 +77,8 @@ entries:
         route: doaj.seal              # ~~->Seal:WebRoute~~
       - label: Transparency & best practice
         route: doaj.transparency      # ~~->Transparency:WebRoute~~
-      - label: Why index your journal in DOAJ?
-        route: doaj.why_index         # ~~->WhyIndex:WebRoute~~
+      - label: Publisher information
+        route: doaj.publisher_responsibilities         # ~~->PublisherResponsibilities:WebRoute~~
       - label: Licensing & copyright
         route: doaj.copyright_and_licensing         # ~~->CopyrightAndLicensing:WebRoute~~
       # Uncomment once this page is ready to be published

cms/data/notifications.yml

@@ -1,7 +1,7 @@
 # ~~Notifications:Data~~
 application:assed:assigned:notify:
   long: |
-    An application, or update request for the journal **{journal_title}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
+    An application for the journal **{journal_title}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
     New application ({issns}) assigned to you
 
@@ -146,4 +146,4 @@ journal:assed:discontinuing_soon:notify:
   long: |
     Journal "{title}" (id: {id}) will discontinue in {days} days.
   short:
-     Journal discontinuing
+     Journal discontinuing

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,20 @@ 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 
+
+- name: Iași University of Life Sciences
+  url: https://iuls.ro/en/
+  logo: Lasi.png 
+
+- name: Beijing Lanbotu Technology Co
+  url: https://xueshu.libtools.com.cn/?tenant_id=1 
+  logo: Beijing.jpg
+