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

Development #3289

Merged
merged 74 commits into from
Feb 3, 2023
Merged

Development #3289

merged 74 commits into from
Feb 3, 2023

Commits on Nov 17, 2022

  1. add popover for org_profile page

    @pengyin-shan
    pengyin-shan committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    15eb3ae View commit details
    Browse the repository at this point in the history

  2. update message for public plan definition

    @pengyin-shan
    pengyin-shan committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    5fa3d11 View commit details
    Browse the repository at this point in the history

  3. update csv name for statistics

    @pengyin-shan
    pengyin-shan committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    3e8815e View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Merge branch 'development' into statistics_filename_change

    @briri
    briri authored Nov 29, 2022
    Configuration menu
    Copy the full SHA
    f27bcd4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into org_type_tip

    @briri
    briri authored Nov 29, 2022
    Configuration menu
    Copy the full SHA
    d480507 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into statistics_filename_change

    @pengyin-shan
    pengyin-shan authored Nov 29, 2022
    Configuration menu
    Copy the full SHA
    ba2a988 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into org_type_tip

    @pengyin-shan
    pengyin-shan authored Nov 29, 2022
    Configuration menu
    Copy the full SHA
    3d254a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Froze mail gem version

    @benjaminfaure
    benjaminfaure committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    1feb31b View commit details
    Browse the repository at this point in the history

  2. Added scss files to editorconfig

    @benjaminfaure
    benjaminfaure committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    c759ba1 View commit details
    Browse the repository at this point in the history

  3. test CHANGELOG file

    @pengyin-shan
    pengyin-shan committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    9387356 View commit details
    Browse the repository at this point in the history

  4. update danger in gemfile

    @pengyin-shan
    pengyin-shan committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    8a441a4 View commit details
    Browse the repository at this point in the history

  5. add danger figuration

    @pengyin-shan
    pengyin-shan committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    c5b88e6 View commit details
    Browse the repository at this point in the history

  6. fix rubocop

    @pengyin-shan
    pengyin-shan committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    157a0d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Rubocoped Gemfile

    @benjaminfaure
    benjaminfaure committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    0320a29 View commit details
    Browse the repository at this point in the history

  2. fix test folder name

    @pengyin-shan
    pengyin-shan committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    439d642 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3258 from DMPRoadmap/changelog_danger 

    Add Changelog.md and Danger Github action to code review process
    @pengyin-shan
    pengyin-shan authored Dec 8, 2022
    Configuration menu
    Copy the full SHA
    aeba6b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. sync translation again and update Danger file

    @pengyin-shan
    pengyin-shan committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    b72e34d View commit details
    Browse the repository at this point in the history

  2. use failure instead of fail to aovid rubocop complain

    @pengyin-shan
    pengyin-shan committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    9cf7dbd View commit details
    Browse the repository at this point in the history

  3. add exception message for translation.io changes

    @pengyin-shan
    pengyin-shan committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    bdb07f2 View commit details
    Browse the repository at this point in the history

  4. fix Dangerfile

    @pengyin-shan
    pengyin-shan committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    3f64a77 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. test CHANGELOG file

    @pengyin-shan @benjaminfaure
    pengyin-shan authored and benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    482f355 View commit details
    Browse the repository at this point in the history

  2. update danger in gemfile

    @pengyin-shan @benjaminfaure
    pengyin-shan authored and benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    eeab22e View commit details
    Browse the repository at this point in the history

  3. add danger figuration

    @pengyin-shan @benjaminfaure
    pengyin-shan authored and benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    2e761b5 View commit details
    Browse the repository at this point in the history

  4. fix rubocop

    @pengyin-shan @benjaminfaure
    pengyin-shan authored and benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    e7231ab View commit details
    Browse the repository at this point in the history

  5. fix test folder name

    @pengyin-shan @benjaminfaure
    pengyin-shan authored and benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    f6a13bd View commit details
    Browse the repository at this point in the history

  6. Updated CHANGELOG

    @benjaminfaure
    benjaminfaure committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    54797da View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' into issue3254

    @benjaminfaure
    benjaminfaure authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    35bd57a View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Merge branch 'development' into add_scss_to_editorconfig

    @briri
    briri authored Dec 13, 2022
    Configuration menu
    Copy the full SHA
    e2fb1f5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3263 from DMPRoadmap/translation_sync_dangerfile_… 

    …update

[#trivial] Translation sync and Dangerfile update
    @pengyin-shan
    pengyin-shan authored Dec 13, 2022
    Configuration menu
    Copy the full SHA
    66cb809 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Updated CHANGELOG

    @benjaminfaure
    benjaminfaure committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    951bae2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into issue3254

    @briri
    briri authored Dec 14, 2022
    Configuration menu
    Copy the full SHA
    fe49376 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. added validation with error message when user enters very large value… 

    … for file size
    @gjacob24
    gjacob24 committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    2572363 View commit details
    Browse the repository at this point in the history

  2. edited CHANGELOG.md to add details of the previous PR

    @gjacob24
    gjacob24 committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    b8cc5ab View commit details
    Browse the repository at this point in the history

  3. added research outputs to the CSV download of the plan

    @briri
    briri committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    e861efb View commit details
    Browse the repository at this point in the history

  4. updated JS that interacts with TinyMCE so that it stops using depreca… 

    …ted setMode function
    @briri
    briri committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9cfce0d View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. updated changelog

    @briri
    briri committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    44667f8 View commit details
    Browse the repository at this point in the history

  2. updated changelog

    @briri
    briri committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    f089114 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. fix to properly use max per page settings

    @briri
    briri committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d104060 View commit details
    Browse the repository at this point in the history

  2. added changelog entry

    @briri
    briri committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    ffbe90c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. updated api v0 to use max_pages config value for api

    @briri
    briri committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    d6ee0ff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into org_type_tip

    @briri
    briri authored Jan 23, 2023
    Configuration menu
    Copy the full SHA
    6bb36e8 View commit details
    Browse the repository at this point in the history

  3. Updated PDF font selector to use Roboto instead of Helvetica since Go… 

    …ogle no longer has Helvetica

updated changelog
    @briri
    briri committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    16c2f27 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Merge branch 'development' into add_scss_to_editorconfig

    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    85063e0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3275 from DMPRoadmap/research_output_file_size_issue 

    Fix for issue #3161
    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    9f55ff5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3276 from DMPRoadmap/tinymce-update 

    updated JS that interacts with TinyMCE so that it stops using depreca…
    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    afe989e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into research-outputs-csv

    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    dfe09ee View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into issue3254

    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    b9b21f6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3256 from benjaminfaure/add_scss_to_editorconfig 

    Added scss files to editorconfig
    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d0c1ecc View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3242 from DMPRoadmap/statistics_filename_change 

    Change csv file name for statistics from 'Completed' to 'Created'
    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    0fc240e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3241 from DMPRoadmap/org_type_tip 

    add popover for org_profile page and add explanation for public plan
    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    70ecdf1 View commit details
    Browse the repository at this point in the history

  9. Update CHANGELOG.md

    @benjaminfaure
    benjaminfaure authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    68ac8a7 View commit details
    Browse the repository at this point in the history

  10. updated paginable concern to fix issue with keyword args

    @briri
    briri committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    6734056 View commit details
    Browse the repository at this point in the history

  11. fixed an issue that was causing templates.visibility to get set to or… 

    …ganizationally_visible even when the org is a funder
    @briri
    briri committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    1d02678 View commit details
    Browse the repository at this point in the history

  12. updated change log

    @briri
    briri committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    5246ce3 View commit details
    Browse the repository at this point in the history

  13. fixed typo

    @briri
    briri committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    f90fc88 View commit details
    Browse the repository at this point in the history

  14. make rubocop happy

    @briri
    briri committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    beaaa93 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. removed before action from api v0 base_controller. opted to just incl… 

    …ude functionality in the plans controller
    @briri
    briri committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    b664780 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' of github.com:DMPRoadmap/roadmap into pagi… 

    …nation-fix
    @briri
    briri committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    66b628c View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Added missing show_research_outputs option into as_csv method

    @benjaminfaure
    benjaminfaure committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    7e2e563 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3279 from DMPRoadmap/pagination-fix 

    fix to properly use max per page settings
    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    00459b6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into domo-arigato

    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    cfc9b39 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3284 from DMPRoadmap/domo-arigato 

    Switched Google font used in PDFs from Helvetica to Roboto
    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    1b816d9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into fix-pagniable-links

    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    223a7f9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3285 from DMPRoadmap/fix-pagniable-links 

    Fix KeywordArgs issue in Paginable concern
    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    1348990 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' into issue3254

    @benjaminfaure
    benjaminfaure authored Jan 27, 2023
    Configuration menu
    Copy the full SHA
    9a62130 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

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

    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    2300c89 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3277 from DMPRoadmap/research-outputs-csv 

    added research outputs to the CSV download of the plan
    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    36b6dfb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into issue3254

    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    16f35a4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3255 from benjaminfaure/issue3254 

    Froze mail gem version
    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    b99cadc View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into fix-template-save

    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    20093d2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3286 from DMPRoadmap/fix-template-save 

    Template visibility changed to organizationally_visible
    @benjaminfaure
    benjaminfaure authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    72e6f76 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Updated translations

    @benjaminfaure
    benjaminfaure committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    af32bbe View commit details
    Browse the repository at this point in the history

  2. Updated Ruby & JS dependencies

    @benjaminfaure
    benjaminfaure committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    203a1c2 View commit details
    Browse the repository at this point in the history

  3. Make rubocop happy

    @benjaminfaure
    benjaminfaure committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    27c3c4a View commit details
    Browse the repository at this point in the history