Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade upstream 1.4.0 rdmo 1.6.0 #118

Open
wants to merge 99 commits into
base: master
Choose a base branch
from

Conversation

kaprz001
Copy link
Collaborator

@kaprz001 kaprz001 commented Dec 21, 2023

Changes proposed in this pull request:

@FDM-UARuhr/Reviewers

Zack-83 and others added 30 commits September 15, 2023 14:38
* Update fhpshort.xml
* Update snf.xml
* Update publisso_terms4life_emiminV1_questions.xml
Neue Fragebögen: DFG Chemie und ERC Grants rdmorganiser#195
* Update SMP readme

* Repaired broken link for MPI-M policy
* Create CITATION.cff

---------

Co-authored-by: Yves Vincent Grossmann <[email protected]>
…niser#209)

* Fixing of broken links etc.

---------

Co-authored-by: Giacomo Lanza <[email protected]>
* Update ble_domain_1.0.xml

Status vom Projekt (Skizze / Antrag / Laufend ...) hinzugefügt

* Create ble_view.xml

- Status des Projekts wird dargestellt
- View kann auf Deutsch und Englisch dargestellt werden, abhängig von der in RDMO eingestellten Sprache

* Delete shared/BLE_JKI/ble_view_en_1.0.xml

wird durch ble_view.xml ersetzt

* Delete shared/BLE_JKI/ble_view_de_1.0.xml

veraltet und wird nicht mehr benötigt, in ble_view.xml sind jetzt Deutsch und Englisch enthalten.

* Update ble_options_1.0.xml

Projektstatus hinzugefügt (Skizze / Antrag / Laufend  usw. )

* Update readme.md

Anleitung zum einbinden des Referenz .docx File für pandoc hinzugefügt

* Update ble_questions_1.0.xml

Frage für Projektstatus hinzugefügt + bugfixes

* Vorlage für der Word-Export via pandoc
The link towards the software license policy at the MPI Metro was broken; now fixed.
The link towards the software license policy at the MPI Metro was broken; now fixed.
minor language corrections for lang="en"

---------

Co-authored-by: Giacomo Lanza <[email protected]>
<help lang="en"/> ersetzt durch <help lang="en">
The link towards the software license policy at the MPI Metro was broken; now fixed.
Zack-83 and others added 11 commits November 17, 2023 11:03
* FDNext Policy-Generator

* FDNext Policy-Generator Fix

* Update shared/FDNext/fdnext_template_questions.xml

Restored new lines

Co-authored-by: Giacomo Lanza <[email protected]>

* Update shared/FDNext/fdnext_template_domain.xml

Removed unused attributes

Co-authored-by: Giacomo Lanza <[email protected]>

* Update shared/FDNext/fdnext_template_domain.xml

Co-authored-by: Giacomo Lanza <[email protected]>

---------

Co-authored-by: Giacomo Lanza <[email protected]>
* Add helptext to project partner questionset

* Apply suggestions from code review

* Apply suggestions from code review

* Update rdmo.xml

---------

Co-authored-by: Giacomo Lanza <[email protected]>
* Fix broken link in SMP Questions

The link towards the software license policy at the MPI Metro was broken; now fixed.

* Moved SMP to Kernbereich and changed URIs

* Update URIs in SMP domain

* integrate SMP-specific 44 attributes and 1 condition into the main files

* Fixing of broken links etc.

* Create dfg-checkliste.xml

add first version view for dfg checkliste catalog

* fix view metadata

* add conditions for dfg checklist view

* Update SMP_Readme.md

* adjust paragraphs and newlines

* ...

* Update view

* Update view

* Update View

* Update View

* Update dfg-checkliste

---------

Co-authored-by: Yves Vincent Grossmann <[email protected]>
Co-authored-by: Giacomo Lanza <[email protected]>
Co-authored-by: Giacomo Lanza <[email protected]>
Co-authored-by: Giacomo Lanza <[email protected]>
Remove working copy of the DFG Checklist view .
@kaprz001 kaprz001 self-assigned this Dec 21, 2023
Copy link
Member

@HenningTimm HenningTimm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hab gerade einmal drüber geguckt. Eine Inkonsistenz ist mir aufgefallen. Wir scheinen den Eintrga Infrastructure Resources in rdmorganizer/options/rdmo.xml doppelt zu haben. Das kann aber sein, dass der Fehler schon vom letzten Mal ist. Das sollten wir auf jeden Fall aufräumen.

rdmorganiser/options/rdmo.xml Outdated Show resolved Hide resolved
rdmorganiser/questions/horizon-europe.xml Show resolved Hide resolved
Replace escape characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.