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.

Sign up for GitHub

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

Jump to bottom

New maDMP Research Outputs tab #2992

Merged
merged 32 commits into from
Apr 6, 2022
Merged

New maDMP Research Outputs tab #2992

merged 32 commits into from
Apr 6, 2022

Commits on Aug 6, 2021

  1. added research outputs to plan 

    Added tests

added tests for new external_api services

Added test for new presenter

change migration classname

fixes for rubocop and rspec

offerings to the rubocop gods

cleanup of unused code and added config for license opts

fixed tests

cleaned up schema

Fix for postgres regex matching

Fix for postgres regex matching

trying to fix postgres

updated config to disable research_outputs by default

updated plans_controller to work with new Plan.grant setter method

removed debug lines

fixed typo in plan model and added dependent destroy on a few associations

removed debug lines

fixed bug in v1 api due to removed Plan.api_client column

updated plan spec factory so that :creator ensures the owner's org matches the plan.org

added api_client association back to plans model. Added some Mysql vs Postgres helper methods to the ApplicationRecord base class

making rubocop happy

fix typo

making rubocop happy

trying to fix postgres :/

Hopefully fibally fixed postgres

Hopefully fibally fixed postgres

Hopefully fibally fixed postgres
    @briri
    briri committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    b52f735 View commit details
    Browse the repository at this point in the history

  2. added feature test for the new modal search dialog

    @briri
    briri committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    548dbee View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2021

  1. fixed issues with rubocop and tests

    @briri
    briri committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    d584f4f View commit details
    Browse the repository at this point in the history

  2. fix for failing repository model test

    @briri
    briri committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    aa7ca94 View commit details
    Browse the repository at this point in the history

  3. made rubocop happy and fixed overwritten funding presenter spec

    @briri
    briri committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    bb1f334 View commit details
    Browse the repository at this point in the history

  4. appeasing rubocop

    @briri
    briri committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    834fe69 View commit details
    Browse the repository at this point in the history

  5. appeasing rubocop

    @briri
    briri committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    df6e8a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2021

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Aug 18, 2021
    Configuration menu
    Copy the full SHA
    abbea08 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Aug 19, 2021
    Configuration menu
    Copy the full SHA
    3ee100f View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2021

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Aug 24, 2021
    Configuration menu
    Copy the full SHA
    9519b6d View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2021

  1. Merge branch 'development' of github.com:DMPRoadmap/roadmap into madm… 

    …p-research-outputs
    @briri
    briri committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    44b661a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'madmp-research-outputs' of github.com:DMPRoadmap/roadma… 

    …p into madmp-research-outputs
    @briri
    briri committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    abb35b7 View commit details
    Browse the repository at this point in the history

  3. hopeful fix for randomly failing spec

    @briri
    briri committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    8d5b954 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    33b8b1b View commit details
    Browse the repository at this point in the history

  2. fixed rubocop

    @briri
    briri committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    8a9cd8f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Feb 2, 2022
    Configuration menu
    Copy the full SHA
    2c047b1 View commit details
    Browse the repository at this point in the history

  4. revert change to plans factory

    @briri
    briri committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    4aa76f8 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Feb 25, 2022
    Configuration menu
    Copy the full SHA
    e5b4ca0 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Mar 3, 2022
    Configuration menu
    Copy the full SHA
    3065ea4 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    6b11cac View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    fefe46b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. add validation to new madmp models

    @nicolasfranck
    nicolasfranck committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    379f70d View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    36fc51b View commit details
    Browse the repository at this point in the history

  2. added node_modules to ignored source paths for translation.io ... sho… 

    …uld speed up scripts. Reverted some use of '%<var>s' to the preferred '%{var}' style
    @briri
    briri committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    a7a2d83 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'madmp-research-outputs' of github.com:DMPRoadmap/roadma… 

    …p into madmp-research-outputs
    @briri
    briri committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    6b18c4c View commit details
    Browse the repository at this point in the history

  4. fixed typo in test

    @briri
    briri committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    306a608 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'madmp-research-outputs' into madmp-research-outputs_val… 

    …idation
    @briri
    briri authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    661a952 View commit details
    Browse the repository at this point in the history

  6. fixed rubocop complaints

    @briri
    briri committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    8015bb1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'nicolasfranck-madmp-research-outputs_validation' into m… 

    …admp-research-outputs
    @briri
    briri committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    3bc7561 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. updated rspec test for re3data service to use controlled list of term… 

    …s for repository access types
    @briri
    briri committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    74076b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into madmp-research-outputs

    @briri
    briri authored Apr 5, 2022
    Configuration menu
    Copy the full SHA
    f7ef1f4 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Merge branch 'development' into madmp-research-outputs

    @raycarrick-ed
    raycarrick-ed authored Apr 6, 2022
    Configuration menu
    Copy the full SHA
    e93dbb9 View commit details
    Browse the repository at this point in the history