Skip to content

Commit

Permalink
Merge branch 'develop' into feature/903_remove_blanks
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven-Eardley committed Jul 11, 2023
2 parents 60b72ed + 6f3a86e commit b6966d9
Show file tree
Hide file tree
Showing 118 changed files with 1,438 additions and 601 deletions.
7 changes: 6 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ orbs:

jobs:
build-and-test:

docker:
- image: cimg/python:3.8.10
environment:
Expand All @@ -13,6 +14,7 @@ jobs:
- xpack.security.enabled: false
- transport.host: localhost
- discovery.type: single-node

steps:
- checkout
- run: git submodule update --init --recursive
Expand All @@ -26,6 +28,9 @@ jobs:
python portality/cms/build_sass.py
pytest -v --color=yes --code-highlight=yes --log-level=DEBUG doajtest/unit
working_directory: ~/doaj


workflows:
unit_tests:
jobs:
Expand All @@ -34,4 +39,4 @@ workflows:
branches:
ignore:
- /release\/.*/
- static_pages
- static_pages
Binary file added cms/assets/img/ambassadors/Nizameddin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/at-20/2003-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/at-20/2004-06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/at-20/2014-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/at-20/2020-11-application.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/sponsors/oaworks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/Amir Reza Asnafi.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/Emrah Kaya.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/Kadri Kiran.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/Nizameddin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/Pablo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/volunteers/pg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions cms/data/advisory-board-council.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@ council:
coi:
2019: https://drive.google.com/file/d/1S2H8XZwWkZzB8oYjRFxuKX6A2AQKh-2O/view?usp=sharing

- name: Shelley Allen
institution: Emerald Publishing
country: United Kingdom
coi:
2019: https://drive.google.com/file/d/1Mp4vRvmB3Layl9EiaKVXZZjjpxvXWskX/view?usp=sharing

- name: Stephanie Savage
institution: University of British Columbia
country: Canada
Expand Down
2 changes: 1 addition & 1 deletion cms/data/ambassadors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

- name: Adrian Stanley
region: North America
bio: "Adrian is past President of the <a href='https://www.sspnet.org/' target='_blank'>Society for Scholarly Publishing</a> (SSP). He has previously lived and worked in China and is well connected with the global publishing community, especially in places like Brazil (<a href='https://scielo.org/en/' target='_blank'>SciELO</a>) and Japan (<a href='https://www.jstage.jst.go.jp/' target='_blank'>J-STAGE</a>). He was also Managing Director, Publishers for <a href='https://www.digital-science.com/about-us/' target='_blank'>Digital Science</a>. Adrian serves on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and he is currently the General Manager at <a href='https://www.jmirpublications.com/' target='_blank'>JMIR Publications</a>."
bio: "Adrian is past President of the <a href='https://www.sspnet.org/' target='_blank'>Society for Scholarly Publishing</a> (SSP). He has previously lived and worked in China and is well connected with the global publishing community, especially in places like Brazil (<a href='https://scielo.org/en/SciELO' target='_blank'>Scielo</a>) and Japan (<a href='https://www.jstage.jst.go.jp/' target='_blank'>J-STAGE</a>). He was also Managing Director, Publishers for <a href='https://www.digital-science.com/about-us/' target='_blank'>Digital Science</a>. Adrian serves on the <a href='https://www.oaswitchboard.org/about' target='_blank'>OA Switchboard</a> Client Advisor Group, and is the Chair of the <a href='https://fullyoapublishers.org/' target='_blank'>Fully OA Publishers Group</a> (a sub group formed out of OASPA working group), he is currently an Independent Contractor, and advisor for <a href='https://www.jmirpublications.com/' target='_blank'>JMIR Publications</a>, <a href='http://dataseer.ai/' target='_blank'>DataSeer.ai</a> and <a href='http://underline.io/' target='_blank'>Underline.io</a>."
photo: "Adrian.png"
coi:
2022: https://drive.google.com/file/d/1CC6bqk_JF_kovY6Z-SVhv01epY7dcYWq/view?usp=sharing
Expand Down
28 changes: 20 additions & 8 deletions cms/data/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ silver:
url: https://www.cappelendammundervisning.no/
logo: cda.jpg

- name: Cambridge University Press
url: https://www.cambridge.org/
logo: cambridge.svg

- name: Copernicus Publications
url: https://publications.copernicus.org
logo: copernicus.svg
Expand All @@ -35,10 +31,6 @@ silver:
- name: Frontiers
url: https://www.frontiersin.org/
logo: frontiers.svg

- name: JMIR Publications
url: https://jmirpublications.com/
logo: jmir.svg

- name: Knowledge E
url: https://knowledgee.com/
Expand All @@ -47,6 +39,10 @@ silver:
- name: MDPI
url: https://www.mdpi.com/
logo: mdpi.svg

- name: OA.Works
url: https://oa.works/
logo: oaworks.png

- name: SAGE Publishing
url: https://www.sagepublications.com/
Expand All @@ -69,6 +65,10 @@ bronze:
- 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

- name: Digital Science
url: https://www.digital-science.com/
Expand All @@ -93,6 +93,10 @@ bronze:
- name: Institute of Physics
url: https://www.iop.org/
logo: iop.jpg

- name: JMIR Publications
url: https://jmirpublications.com/
logo: jmir.svg

- name: Karger
url: https://www.karger.com/
Expand All @@ -102,6 +106,10 @@ bronze:
url: https://www.keaipublishing.com/
logo: keai.svg

- name: OASPA
url: https://oaspa.org/
logo: oaspa.png

- name: OCLC
url: https://www.oclc.org/
logo: oclc.svg
Expand All @@ -113,6 +121,10 @@ 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/
Expand Down
4 changes: 2 additions & 2 deletions cms/data/team.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
- name: Iemima Ploscariu
role: Managing Editor
photo: iemima.jpeg
bio: 'Iemima holds a Master of Arts in Comparative History from Central European University, Hungary, and a Master of Letters in Central and East European Studies from the University of St Andrews, Scotland. She is a PhD student and researcher for the Irish Research Council at Dublin City University, Ireland. She volunteered as an Editor for DOAJ from 2014 until 2020 when she became a Managing Editor.'
bio: 'Iemima holds a PhD in History from Dublin City University, Ireland, as an Irish Research Council fellow. She also has an MA in Comparative History and an MLitt in Central and East European Studies. She is originally from Romania, grew up in California, and now lives in Barcelona, Spain. She volunteered as an Editor for DOAJ from 2014 until 2020 when she became a Managing Editor.'
coi:
2020: https://drive.google.com/file/d/1-4wTgvwCu_tvDv5NIoJhZi0QpQl-fpdB/view?usp=sharing
2022: https://drive.google.com/file/d/1xEUUxhqSE0OnKd_x8z1oLLRRrJrKAwXA/view?usp=sharing
Expand Down Expand Up @@ -193,7 +193,7 @@ Based in Rome and Göttingen, Ilaria loves baking cakes; she speaks Italian, Eng
2022: https://drive.google.com/file/d/19J5ELHNaV_pby7ZpQMii8_Ts4wiERu8K/view?usp=sharing

- name: Tom Olijhoek
role: Editor-in-Chief
role: Head of Outreach
photo: tom.jpg
bio: 'Tom has a PhD in molecular microbiology and spent several years in Africa doing research on malaria, sleeping sickness and meningococcal epidemics. He has been actively advocating open access and open science since 2012 when he joined the Open Knowledge community and became a member of the DOAJ advisory board. His current research interests are development of quality systems for the assessment of scholarly journals and articles, and research in the area of soil microbiology in relation to soil health and human health.'
coi:
Expand Down
59 changes: 42 additions & 17 deletions cms/data/volunteers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,22 @@ ed:
featured: true
photo: "napa.jpg"

- name: Pablo Hernandez
area: Medical Sciences
year_since:
city: Caracas
country: Venezuela
language: Spanish, English
photo: "Pablo.jpg"

- name: Paola Galimberti
area: Research Evaluation
year_since:
city: Milan
country: Italy
language: Italian, German, English
featured: true
photo: "pg.png"

- name: Rasoul Zavaraqi
area: Knowledge and Information Science
Expand Down Expand Up @@ -116,7 +125,15 @@ ass_ed:
city: Florence
country: Italy
language: Italian, English, Spanish


- name: Amir Reza Asnafi
area: Library and Information Science, Scientometrics
year_since:
city: Tehran
country: I.R.Iran
language: Persian (Farsi), English
photo: "Amir Reza Asnafi.jpg"

- name: Ana Fresco-Santalla
area: Humanities
year_since:
Expand Down Expand Up @@ -322,6 +339,14 @@ ass_ed:
city: Minneapolis, MN
country: USA
language: English

- name: Emrah Kaya
area: Social Sciences, Humanities
year_since:
city: Sakarya
country: Turkey
language: English
photo: "Emrah Kaya.jpg"

- name: Francesca Soldati
area: Science
Expand Down Expand Up @@ -439,6 +464,14 @@ ass_ed:
country:
language: Korean, English

- name: Kadri Kıran
area: Systematic Entomology
year_since:
city: Tekirdag
country: Turkey
language: English, Turkish, German
photo: "Kadri Kiran.jpg"

- name: Kâmil B. Varınca
area: Science
year_since:
Expand Down Expand Up @@ -624,6 +657,14 @@ ass_ed:
country: Georgia
language: Georgian, English
photo: "NatiaGabedava.jpg"

- name: Nizameddin Koca
area: Internal Medicine
year_since:
city: Bursa
country: Turkey
language: English, Turkish
photo: "Nizameddin.jpg"

- name: Nour El Houda Belhamel
area: Science, Technology, Medicine
Expand Down Expand Up @@ -655,29 +696,13 @@ ass_ed:
country:
language:

- name: Orhan Canpolat
area: Engineering
year_since:
city: Istanbul
country: Türkiye
language: Turkish, English
photo: "Orhan CANPOLAT.jpg"

- name: Oskia Agirre
area: Library and Information Science
year_since:
city: Donostia
country: Spain
language: Euskera, Spanish, English

- name: Pablo Hernandez
area: Science
year_since:
city: Caracas
country: Venezuela
language: Spanish, English
photo: "pablohernandez.jpg"

- name: Paula Carina de Araújo
area: Library and Information Science
year_since:
Expand Down
Loading

0 comments on commit b6966d9

Please sign in to comment.