forked from rdmorganiser/rdmo-catalog
-
Notifications
You must be signed in to change notification settings - Fork 4
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
kaprz001
wants to merge
99
commits into
master
Choose a base branch
from
upgrade-upstream-1.4.0-rdmo-1.6.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 <89014209+yvgrossmann@users.noreply.github.com>
…niser#209) * Fixing of broken links etc. --------- Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
* 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 <37865804+Zack-83@users.noreply.github.com>
<help lang="en"/> ersetzt durch <help lang="en">
The link towards the software license policy at the MPI Metro was broken; now fixed.
* FDNext Policy-Generator * FDNext Policy-Generator Fix * Update shared/FDNext/fdnext_template_questions.xml Restored new lines Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> * Update shared/FDNext/fdnext_template_domain.xml Removed unused attributes Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> * Update shared/FDNext/fdnext_template_domain.xml Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> --------- Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
* Add helptext to project partner questionset * Apply suggestions from code review * Apply suggestions from code review * Update rdmo.xml --------- Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
* 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 <89014209+yvgrossmann@users.noreply.github.com> Co-authored-by: Giacomo Lanza <giacomo.lanza@ptb.de> Co-authored-by: Giacomo Lanza <lanza01@pad.ptb.de> Co-authored-by: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Remove working copy of the DFG Checklist view .
HenningTimm
requested changes
Feb 3, 2024
There was a problem hiding this 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.
HenningTimm
approved these changes
Feb 16, 2024
Replace escape characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this pull request:
@FDM-UARuhr/Reviewers