Code

Upgrade upstream 1.4.0 rdmo 1.6.0#118

Code

Open

kaprz001 wants to merge 99 commits intomasterFDM-UARuhr/rdmo-catalog-uaruhr:masterfrom upgrade-upstream-1.4.0-rdmo-1.6.0FDM-UARuhr/rdmo-catalog-uaruhr:upgrade-upstream-1.4.0-rdmo-1.6.0Copy head branch name to clipboard

+13,197-3,171

Commits

Commits on Sep 15, 2023

• Update SMP-Questions.xml

  Zack-83

  authored
  69cc961

Commits on Sep 21, 2023

• Correct WissGrid-link (rdmorganiser#207)

  Show description for 35e1615
  Zack-83

  authored
  35e1615

Commits on Sep 22, 2023

• Content-Übersicht aktualisiert (rdmorganiser#205)

  Show description for bcff7c0
  Zack-83

  authored
  bcff7c0

Commits on Oct 13, 2023

• Minor bug fixes at SMP (rdmorganiser#213)

  Show description for 64a3a14
  yvgrossmann

  authored
  64a3a14

• Create CITATION.cff (rdmorganiser#190)

  Show description for acdbbf3
  

  Zack-83

  and

  yvgrossmann

  authored
  acdbbf3

• Fix of broken links in DFG Checklist and Short Questionnaire (rdmorganiser#209)

  Show description for 65e4165
  

  yvgrossmann

  and

  Zack-83

  authored
  65e4165

Commits on Oct 20, 2023

• Jki ble 20231016 (rdmorganiser#222)

  Show description for f124c5b
  chsinn

  authored
  f124c5b

• Fix evil quote

  triole

  committed
  1b73208

• Fix broken link in SMP Questions

  Show description for fb6a9ba
  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  fb6a9ba

• Moved SMP to Kernbereich and changed URIs

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  246fc91

• Update URIs in SMP domain

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  caecfb2

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

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  8df0594

• Fixing of broken links etc.

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  afb6d01

• Fix broken link in SMP Questions

  Show description for 158e7a6
  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  158e7a6

• Moved SMP to Kernbereich and changed URIs

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  eeec56a

• Update URIs in SMP domain

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  bdcf4f4

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

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  b3d838c

• Fixing of broken links etc.

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  d420be2

• Add verbose_name

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  0ae48e5

• Update rdmo.xml (rdmorganiser#211)

  Show description for 643d1e9
  

  2 peopleauthored and

  Giacomo Lanza

  committed
  643d1e9

• Update rdmo.xml

  Show description for 2133a7f
  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  2133a7f

• Fix broken link in SMP Questions

  Show description for ba06418
  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  ba06418

• Moved SMP to Kernbereich and changed URIs

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  b370c49

• Update URIs in SMP domain

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  236f4aa

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

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  23f1f19

• Fixing of broken links etc.

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  167b015

• Changed SMP in readme to RDMO curated

  

  yvgrossmann

  authored and

  Giacomo Lanza

  committed
  00ed4d4

• Reference docs

  

  Giacomo Lanza

  committed
  df4944f

• Create epm-text.xml

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  6210df9

• Update README.md

  

  Zack-83

  authored and

  Giacomo Lanza

  committed
  60cad86

• update refdocs

  

  Giacomo Lanza

  committed
  d0dcf7d

• Merge branch 'master' into emp-view

  

  Giacomo Lanza

  committed
  b482a6c

• Update README.md

  Zack-83

  authored
  685faf2

Commits on Nov 1, 2023

• merge the two question sets

  Zack-83

  authored
  497f2ce

• Update condition for boolean variable

  Zack-83

  authored
  11e3e14

• Remove additional text from option

  Zack-83

  authored
  6f728da

• Revert "Update condition for boolean variable"

  Show description for d8e36e3
  

  Giacomo Lanza

  committed
  d8e36e3

• Change variable type to text

  Zack-83

  authored
  67e83fc

• Update rdmo.xml

  Zack-83

  authored
  17e5865

• ...

  

  Giacomo Lanza

  committed
  077d5b3

• ...

  

  Giacomo Lanza

  committed
  d5f1716

• Update rdmorganiser/questions/rdmo.xml

  Zack-83

  authored
  d1e84d5

• ...

  

  Giacomo Lanza

  committed
  12135b9

• Merge branch 'master' into emp-view

  

  Giacomo Lanza

  committed
  c42dba2

• Jki ble20231023 (rdmorganiser#234)

  Show description for f69df69
  chsinn

  authored
  f69df69

• Merge branch 'master' into emp-view

  

  Giacomo Lanza

  committed
  9fa70c5

• Merge branch 'master' into 212-maintenance-obsolete-text-box-for-option-option-yes-leads-to-new-optional-question

  

  Giacomo Lanza

  committed
  525074c

• Merge branch 'master' into 703-question-help-needs-changing-person-referred-to-as-item-multiple-times-rdmo-dfgv5-catalog

  

  Giacomo Lanza

  committed
  15ae561

Commits on Nov 2, 2023

• Rephrase question set for dfg v5 catalog (rdmorganiser#236)

  Show description for 2e28ef1
  Zack-83

  authored
  2e28ef1

Commits on Nov 3, 2023

• Add files via upload

  Zack-83

  authored
  3f043d6

• Delete rdmorganiser/views/costs-de.xml

  Zack-83

  authored
  110a8ff

• Delete rdmorganiser/views/costs-en.xml

  Zack-83

  authored
  985c559

• Update README.md

  Zack-83

  authored
  cccc520

• ad files for EPM

  

  Giacomo Lanza

  committed
  d1fdfc8

• refdocs

  

  Giacomo Lanza

  committed
  5357402

• Merge pull request rdmorganiser#235 from rdmorganiser/212-maintenance-obsolete-text-box-for-option-option-yes-leads-to-new-optional-question

  Show description for fcdfc49
  sa-wetter

  authored
  fcdfc49

Commits on Nov 10, 2023

• material for EPM

  

  Giacomo Lanza

  committed
  2834ccd

• ...

  

  Giacomo Lanza

  committed
  e2414a1

• Merge branch 'master' into 703-question-help-needs-changing-person-referred-to-as-item-multiple-times-rdmo-dfgv5-catalog

  Zack-83

  authored
  6e59e8d

• Merge pull request rdmorganiser#206 from rdmorganiser/703-question-help-needs-changing-person-referred-to-as-item-multiple-times-rdmo-dfgv5-catalog

  Show description for 786dd4f
  sa-wetter

  authored
  786dd4f

Commits on Nov 13, 2023

• ...

  

  Giacomo Lanza

  committed
  9ba71de

• adjust header

  

  Giacomo Lanza

  committed
  ccd3014

• .

  

  Giacomo Lanza

  committed
  1ac4a24

Commits on Nov 15, 2023

• reformat table

  Zack-83

  authored
  75a210f

• Add horizon europe catalog help text (rdmorganiser#240)

  Show description for 660695b
  

  jmfrenzel

  and

  Zack-83

  authored
  660695b

• Fix encoded html tag in horizon europe catalog

  jmfrenzel

  committed
  2b21529

Commits on Nov 17, 2023

• Update rdmorganiser/views/costs.xml

  yasmindemerdash

  authored
  f35d24b

• Update rdmorganiser/views/costs.xml

  yasmindemerdash

  authored
  9fefab2

• Update rdmorganiser/views/costs.xml

  yasmindemerdash

  authored
  72d52ed

• Delete shared/metrology-rdm/refDoc-horizon-europe.docx

  Zack-83

  authored
  4628bdb

• Add files via upload

  Zack-83

  authored
  8833810

• Delete shared/metrology-rdm/refDoc-EMPIR.docx

  Zack-83

  authored
  15cd079

• Merge pull request rdmorganiser#238 from rdmorganiser/169-neue-readme-datei-mit-beschreibung-aller-ansichten

  Show description for 42ef39c
  yasmindemerdash

  authored
  42ef39c

• Merge pull request rdmorganiser#237 from rdmorganiser/bilingual-cost-view

  Show description for 3862856
  yasmindemerdash

  authored
  3862856

• Merge pull request rdmorganiser#175 from rdmorganiser/emp-view

  Show description for 65669c1
  yasmindemerdash

  authored
  65669c1

• Correct link to NFDI consortium

  Show description for bf3d1b4
  Zack-83

  authored
  bf3d1b4

Commits on Nov 29, 2023

• FDNext Policy-Generator (rdmorganiser#241)

  Show description for 5466e7d
  

  johlton

  and

  Zack-83

  authored
  5466e7d

• Add FDNext

  Zack-83

  authored
  bb05cf7

Commits on Dec 4, 2023

• Add helptext to project partner questionset (rdmorganiser#243)

  Show description for 5dc168d
  

  jmfrenzel

  and

  Zack-83

  authored
  5dc168d

• View for DFG checklist (rdmorganiser#199)

  Show description for aae2de2
  

  4 peopleauthored
  aae2de2

• Delete rdmorganiser/views/rdmo-uag-dfg-checkliste.xml

  Show description for 918e69d
  jmfrenzel

  authored
  918e69d

Commits on Dec 6, 2023

• Updated README: Fixes to german version and added english version (rdmorganiser#246)

  johlton

  authored
  2102931

Commits on Dec 15, 2023

• Merge branch 'master' of https://github.com/rdmorganiser/rdmo-catalog

  kaprz001

  committed
  541df3c

Commits on Dec 21, 2023

• Merged new content into all_questions.xml

  kaprz001

  authored
  ede6fad

• Replace rdmo keys with ua_ruhr keys

  kaprz001

  committed
  d5a242f

• adapt to new questionset uri and generate new catalogs

  jmfrenzel

  committed
  df6566b

• Rename tags for training catalogue questions

  kaprz001

  authored
  0691767

Commits on Dec 22, 2023

• Update README_training.md

  kaprz001

  authored
  6f4433b

• Change paths from general to rdm

  kaprz001

  authored
  5998b3e

• Rename requirements section

  kaprz001

  authored
  8a504bc

• Rename content-classification into organization

  kaprz001

  authored
  c261263

• Replace paths

  kaprz001

  authored
  053a42c

• Revert changes

  kaprz001

  authored
  79df6a7

• Clarification for replacing paths

  kaprz001

  authored
  95d997e

Commits on Jan 2, 2024

• Change question URLs

  kaprz001

  committed
  817a2f9

• Remove old path names, yet to put everything in order

  kaprz001

  committed
  90bcddb

Commits on Jan 3, 2024

• Reorder questions and question sets

  kaprz001

  committed
  a02840b

Commits on Feb 16, 2024

• remove double entry

  jmfrenzel

  committed
  313d3ff

Commits on Mar 15, 2024

• Update cat_member.yaml

  Show description for c0d8714
  kaprz001

  authored
  c0d8714