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 #3354

Merged
merged 42 commits into from
Oct 16, 2023
Merged

Development #3354

merged 42 commits into from
Oct 16, 2023

Commits on Nov 8, 2022

  1. add error message and update saving message for plan writing

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

  2. use yellow or warnign for saving process

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

Commits on Nov 29, 2022

  1. Merge branch 'development' into add_error_message

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

Commits on Feb 27, 2023

  1. Merge branch 'development' into add_error_message

    @pengyin-shan
    pengyin-shan authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    d8cd8d4 View commit details
    Browse the repository at this point in the history

  2. update github action to use node 16 only

    @pengyin-shan
    pengyin-shan committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    2295d49 View commit details
    Browse the repository at this point in the history

  3. merge development branch

    @pengyin-shan
    pengyin-shan committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    66522fe View commit details
    Browse the repository at this point in the history

  4. add changelog

    @pengyin-shan
    pengyin-shan committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    60e0a09 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add_error_message' of github.com:DMPRoadmap/roadmap int… 

    …o add_error_message
    @pengyin-shan
    pengyin-shan committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    ae24901 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge branch 'development' into add_error_message

    @briri
    briri committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    5c893ad View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. added .gitkeep file to assets/builds to address issues in production … 

    …deployments. see https://github.com/rails/cssbundling-rails#why-do-i-get-applicationcss-not-in-asset-pipeline-in-production
    @briri
    briri committed May 1, 2023
    Configuration menu
    Copy the full SHA
    e4f8830 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3312 from DMPRoadmap/main 

    Merge latest from main into development
    @briri
    briri authored May 1, 2023
    Configuration menu
    Copy the full SHA
    d7d64e6 View commit details
    Browse the repository at this point in the history

  3. added note to CHANGELOG

    @briri
    briri committed May 1, 2023
    Configuration menu
    Copy the full SHA
    927e885 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into cssbundling-deploy-fix

    @briri
    briri authored May 1, 2023
    Configuration menu
    Copy the full SHA
    9b73b34 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Solved issue where spring was loaded in production mode

    @benjaminfaure
    benjaminfaure committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1c7a126 View commit details
    Browse the repository at this point in the history

  2. Updated CHANGELOG

    @benjaminfaure
    benjaminfaure committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    df693dc View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. fix typo, probably introduced by v1 code

    @nicolasfranck
    nicolasfranck committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b2d55c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Updated fontawesome to V6

    @benjaminfaure
    benjaminfaure committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    b0cbb37 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Added JS constants to be used in the Research Outputs feature

    @gjacob24
    gjacob24 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    76c53a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic… 

    …a, Sans-Serif' to 'Roboto, Arial, Sans-Serif'.
    @dstuckey-uoe
    dstuckey-uoe committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    488072a View commit details
    Browse the repository at this point in the history

  2. Added entry to in Fixed section for this change.

    @dstuckey-uoe
    dstuckey-uoe committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    06bd855 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Moved the fixed-entry for this issue to the top the CHANGELOG.md file.

    @dstuckey-uoe
    dstuckey-uoe committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5d1281b View commit details
    Browse the repository at this point in the history

  2. update CHANGELOG.md as requested by closed PR #3333

    @nicolasfranck
    nicolasfranck committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    7d163b0 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Updated missing icons to fontawesome v6

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

  2. Merge pull request #3339 from DMPRoadmap/issue_3337_default_font_down… 

    …load_page

Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    05a5223 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into add_js_constants_for_research_outputs

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    fbcd2c9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3334 from DMPRoadmap/add_js_constants_for_researc… 

    …h_outputs

Added JS constants to be used in the Research Outputs feature
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a9e5d8b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into fontawesome-v6

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    78e7349 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3329 from DMPRoadmap/fontawesome-v6 

    Updated fontawesome to V6
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    292019e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' into main

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a0980f4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3325 from nicolasfranck/main 

    fix typo, probably introduced by v1 code
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    83ad549 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'development' into issue3316

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    79a8384 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #3320 from DMPRoadmap/issue3316 

    Issue 3316
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    c1b3e54 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'development' into cssbundling-deploy-fix

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    db6ac9b View commit details
    Browse the repository at this point in the history

  12. Merge pull request #3314 from DMPRoadmap/cssbundling-deploy-fix 

    added .gitkeep file to assets/builds to address issues in production …
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    ebe76db View commit details
    Browse the repository at this point in the history

  13. Merge branch 'development' into add_error_message

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    64eef3a View commit details
    Browse the repository at this point in the history

  14. Merge pull request #3232 from DMPRoadmap/add_error_message 

    Add error message and update saving message for plan writing
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9ab03b7 View commit details
    Browse the repository at this point in the history

  15. Update Gemfile.lock and yarn.lock

    John Pinto committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    6ed6960 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #3351 from DMPRoadmap/4.1.1-gem-and-yarn 

    Update Gemfile.lock and yarn.lock
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    3652114 View commit details
    Browse the repository at this point in the history

  17. Revert "Update Gemfile.lock and yarn.lock"

    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    c375492 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #3352 from DMPRoadmap/revert-3351-4.1.1-gem-and-yarn 

    Revert "Update Gemfile.lock and yarn.lock"
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a644ed2 View commit details
    Browse the repository at this point in the history

  19. Update tp gems.

    John Pinto committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    dd6cba3 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #3353 from DMPRoadmap/4.1.1-bundle-update 

    Update tp gems.
    @martaribeiro
    martaribeiro authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    ba149a0 View commit details
    Browse the repository at this point in the history