Skip to content

Commit

Permalink
Merge branch 'develop' into feature/3714_zero_counts_for_articles_in_…
Browse files Browse the repository at this point in the history
…month_dates
  • Loading branch information
Steven-Eardley committed Dec 11, 2023
2 parents 7b47c09 + c76aab2 commit 62eb888
Show file tree
Hide file tree
Showing 113 changed files with 4,612 additions and 2,303 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ src*
build/*
dist/*
tmp/*

*.zip
!doajtest/unit/resources/*.zip
!doajtest/preservation_upload_test_package/*.zip

scratch.py
.coverage
htmlcov/*
Expand Down
Binary file added cms/assets/img/sponsors/Beijing.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/sponsors/Lasi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions cms/data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -77,13 +77,10 @@ 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
#- label: Publisher responsibilities
# route: doaj.publisher_responsibilities # ~~->PublisherResponsibilities:WebRoute~~
- id: stay_up_to_date
label: Stay up to date
footer: true
Expand Down
4 changes: 2 additions & 2 deletions cms/data/notifications.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -146,4 +146,4 @@ journal:assed:discontinuing_soon:notify:
long: |
Journal "{title}" (id: {id}) will discontinue in {days} days.
short:
Journal discontinuing
Journal discontinuing
9 changes: 9 additions & 0 deletions cms/data/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,12 @@
- name: Ubiquity Press
url: https://www.ubiquitypress.com/
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

2 changes: 1 addition & 1 deletion cms/data/team.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
2022: https://drive.google.com/file/d/1fRJtvci2_j4vad0C5N1pfqm2sHZQkFz3/view?usp=sharing

- name: Leena Shah
role: Deputy Head of Editorial (Workflow) and Ambassador
role: Deputy Head of Editorial (Workflow)
photo: leena.jpg
bio: "Leena joined the DOAJ team in 2016 as an Ambassador for India before becoming a Managing Editor. Prior to joining DOAJ she worked as a science librarian at Nanyang Technological University, Singapore, where she developed a keen interest in scholarly communication & open science. A recent addition to her interests is artificial intelligence in scholarly communication. Leena holds a Master’s degree in Information Studies and lives in Singapore. She loves watching sci-fi shows and is enthusiastic about travelling to new places."
coi:
Expand Down
128 changes: 21 additions & 107 deletions cms/data/volunteers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,13 @@

## All editors
ed:

- name: Alain Chaple
area: Medical Sciences
year_since:
city: La Habana
country: Cuba
language: Spanish, English
photo: "alainchaple.png"

- name: Alicia Aparicio
area: Humanities, Social Sciences
- name: Christine Davidian
area: Technology
year_since:
city: Buenos Aires
country: Argentina
language: Spanish
featured: true

city: Glassboro, NJ
country: USA
language: English, French

- name: Fei Yu
area: Librarianship, Scholarly Publishing, Data Management
year_since:
Expand All @@ -29,14 +19,6 @@ ed:
language: Chinese, English
featured: true

- name: Geoff Husic
area: Humanities, Social Sciences
year_since:
city: Lawrence, KS
country: USA
language: Russian, German, English
featured: true

- name: Ikhwan Arief
area: Science, Technology
year_since:
Expand All @@ -58,6 +40,13 @@ ed:
country: Türkiye
language: Turkish, English
featured: true

- name: Muhamad Ratodi
area: Public Health
year_since:
city: Surabaya
country: Indonesia
language: Indonesian, English

- name: Natalia Pamuła-Cieślak
area: Humanities, Social Sciences
Expand Down Expand Up @@ -110,7 +99,14 @@ ed:
## All associate editors

ass_ed:

- name: Alain Chaple
area: Medical Sciences
year_since:
city: La Habana
country: Cuba
language: Spanish, English
photo: "alainchaple.png"

- name: Aleksandra Zawadzka
area: Librarianship
year_since:
Expand All @@ -134,13 +130,6 @@ ass_ed:
language: Persian (Farsi), English
photo: "Amir Reza Asnafi.jpg"

- name: Ana Fresco-Santalla
area: Humanities
year_since:
city: Granada
country: Spain
language: Galician, Portuguese, Spanish, English

- name: Andista Candra Yusro
area: Social Sciences
year_since:
Expand Down Expand Up @@ -198,13 +187,6 @@ ass_ed:
language: Indonesian, English
photo: "azhar.jpg"

- name: Barbara Łuszczek
area: Librarianship
year_since:
city: Bydgoszcz
country: Poland
language: Polish, English

- name: Ben Catt
area: Librarianship, Research Support
year_since:
Expand All @@ -219,14 +201,6 @@ ass_ed:
country: Indonesia
language: Indonesian, English

- name: Cara Forster
area: Health Sciences and Library Science
year_since:
city: Germantown, Maryland
country: USA
language: English, American Sign Language
photo: "cara.jpg"

- name: Carlos Alegre
area: Social Sciences
year_since:
Expand All @@ -243,13 +217,6 @@ ass_ed:
language: Polish, English
photo: "CezaryBorkowicz.jpg"

- name: Christine Davidian
area: Technology
year_since:
city: Glassboro, NJ
country: USA
language: English, French

- name: Constancy Aleru
area: Medical Sciences
year_since:
Expand All @@ -265,13 +232,6 @@ ass_ed:
country: Indonesia
language: Indonesian, English
photo:

- name: Dania Deroy Dominguez
area: Social Sciences
year_since:
city: La Habana
country: Cuba
language: English, French

- name: Daria Chrześcijańska
area: Computer Science, Social Sciences
Expand Down Expand Up @@ -620,13 +580,6 @@ ass_ed:
language: Spanish, English
photo: "MiltonRamirez.jpg"

- name: Muhamad Ratodi
area: Public Health
year_since:
city: Surabaya
country: Indonesia
language: Indonesian, English

- name: Muhamad Taufik Hidayat
area: Humanities, Social Sciences
year_since:
Expand Down Expand Up @@ -734,22 +687,6 @@ ass_ed:
country: Indonesia
language: Indonesian, English

- name: Ramiro Doyenart
area: Health Sciences
year_since:
city: Rio Grande do Sul
country: Brazil
language: Spanish, Portuguese, English
photo: "RamiroDoyenart.jpeg"

- name: Ran Dang
area: Biology, Medical Sciences
year_since:
city: Zhengzhou
country: China
language: Chinese, English
photo: "randang.jpg"

- name: Raúl Sampieri
area: Science
year_since:
Expand All @@ -771,14 +708,6 @@ ass_ed:
country: USA
language: English

- name: Richard James
area: Medicine
year_since:
city: Philadelphia, PA
country: USA
language: English
photo: "rjames.png"

- name: Roberto Sarmiento
area: Engineering
year_since:
Expand Down Expand Up @@ -860,13 +789,6 @@ ass_ed:
country: Romania
language: Romanian, English, French

- name: Umar Khasan
area: Social Sciences
year_since:
city: Bangkalang
country: Indonesia
language: Bahasa Indonesian, English

- name: Utiya Hikmah
area: Material Physics
year_since:
Expand All @@ -883,14 +805,6 @@ ass_ed:
language: Kannada, English
photo: "Vasanth.jpg"

- name: Weldy St-Fleur
area: Social Sciences
year_since:
city: São Paulo
country: Brazil
language: Portuguese, English
photo: "weldy.jpeg"

- name: Yalçın Tükel
area: Sports recreation
year_since:
Expand Down
5 changes: 3 additions & 2 deletions cms/pages/about/at-20.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ There is also an opportunity for you to [support DOAJ during its 20th year](/at-
- Event Time: 13:00 UTC
- Duration: 2 hours
- {% include "includes/svg/at-20/theme_trusted.svg" %}
- **[Registration is open](https://us02web.zoom.us/webinar/register/WN_sePTjc09QbWHUDhgmZ28-A#/registration)**
- Name: _DOAJ at 20: Trusted_
- Date: _7th December 2023_
- Event Time: 14:00 UTC ([Check the event time](https://www.timeanddate.com/worldclock/fixedtime.html?msg=DOAJ+at+20%3A+Trusted&iso=20231207T14&p1=1440&ah=1&am=30) where you are.)
Expand All @@ -48,11 +49,11 @@ Our first of three events marking our 20th anniversary took place on the 15th Ju

## Global

Our second event will be around the theme Global, where we will have eight lighting talks from speakers from around the world. Our moderator and DOAJ Ambassador, Ivonne Lujano, will introduce speakers and manage two Q&As, where the audience can ask our speakers questions. More information about the event and all the speakers can be found on the [registration page](https://us02web.zoom.us/webinar/register/WN_fu42oi59S7GZ366rjyAUGg#/registration).
Our second event was around the theme Global and took place on the 28th September 2023. The event consisted of eight lighting talks from speakers from around the world. Our moderator and DOAJ Ambassador, Ivonne Lujano, introduced speakers and managed two Q&As, where the audience could ask our speakers questions. A recording of the event is [available on YouTube](https://www.youtube.com/watch?v=TRjtc-7tg8w).

## Trusted

Our third and last DOAJ at 20 event will be around the theme Trusted. More information about this event will be available later in the year.
Our third and last DOAJ at 20 event will be around the theme Trusted, where our four speakers, Judith Barnsby, Ivan Oransky, Ixchel Faniel and Dr Haseeb Irfanullah will discuss what trust and mistrust means in scholarly communications. The event will be moderated by Joy Owango, Founding Director of TCC Africa, and there will be a Q&A where the audience can ask questions. [Registration is open](https://us02web.zoom.us/webinar/register/WN_sePTjc09QbWHUDhgmZ28-A#/registration) for this event, and the event is free to attend.

## Timeline

Expand Down
Loading

0 comments on commit 62eb888

Please sign in to comment.