Skip to content

Commit

Permalink
Merge branch 'feature/3575_make_notes_searchable' of github.com:DOAJ/…
Browse files Browse the repository at this point in the history
…doaj into feature/3575_make_notes_searchable
  • Loading branch information
richard-jones committed Nov 8, 2023
2 parents 8009ebe + 8032a86 commit ceee784
Show file tree
Hide file tree
Showing 44 changed files with 1,572 additions and 1,186 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
3 changes: 3 additions & 0 deletions cms/assets/img/sponsors/Degruyter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion cms/data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
36 changes: 17 additions & 19 deletions cms/data/sponsors.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
11 changes: 6 additions & 5 deletions cms/pages/about/at-20.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@ There is also an opportunity for you to [support DOAJ during its 20th year](/at-
- Event Time: 13:00 UTC
- Duration: 90 mins
- {% include "includes/svg/at-20/theme_global.svg" %}
- **[Registration is open](https://us02web.zoom.us/webinar/register/WN_fu42oi59S7GZ366rjyAUGg#/registration)**
- **[Recording is available](https://www.youtube.com/watch?v=TRjtc-7tg8w)**
- Name: _DOAJ at 20: Global_
- Date: _28th September 2023_
- Event Time: 13:00 UTC ([Check the event time](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20230928T13&ah=1&am=30) where you are.)
- 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: to be confirmed
- 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.)
- Duration: 90 mins

## Open
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 ceee784

Please sign in to comment.