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

Conversation

martaribeiro
Copy link
Contributor

V4.1.1

Added

Fixed

pengyin-shan and others added 30 commits November 8, 2022 15:00
@pengyin-shan
add error message and update saving message for plan writing
35fb4a4
@pengyin-shan
use yellow or warnign for saving process
ade7f8c
@pengyin-shan
Merge branch 'development' into add_error_message
e9148b3
@pengyin-shan
Merge branch 'development' into add_error_message
d8cd8d4
@pengyin-shan
update github action to use node 16 only
2295d49
@pengyin-shan
merge development branch
66522fe
@pengyin-shan
add changelog
60e0a09
@pengyin-shan
Merge branch 'add_error_message' of github.com:DMPRoadmap/roadmap int…
ae24901 
…o add_error_message
@briri
Merge branch 'development' into add_error_message
5c893ad
@briri
added .gitkeep file to assets/builds to address issues in production …
e4f8830 
…deployments. see https://github.com/rails/cssbundling-rails#why-do-i-get-applicationcss-not-in-asset-pipeline-in-production
@briri
Merge pull request #3312 from DMPRoadmap/main
d7d64e6 
Merge latest from main into development
@briri
added note to CHANGELOG
927e885
@briri
Merge branch 'development' into cssbundling-deploy-fix
9b73b34
@benjaminfaure
Solved issue where spring was loaded in production mode
1c7a126
@benjaminfaure
Updated CHANGELOG
df693dc
@nicolasfranck
fix typo, probably introduced by v1 code
b2d55c6
@benjaminfaure
Updated fontawesome to V6
b0cbb37
@gjacob24
Added JS constants to be used in the Research Outputs feature
76c53a5
@dstuckey-uoe
Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
488072a 
…a, Sans-Serif' to 'Roboto, Arial, Sans-Serif'.
@dstuckey-uoe
Added entry to in Fixed section for this change.
06bd855
@dstuckey-uoe
Moved the fixed-entry for this issue to the top the CHANGELOG.md file.
5d1281b
@nicolasfranck
update CHANGELOG.md as requested by closed PR #3333
7d163b0
@benjaminfaure
Updated missing icons to fontawesome v6
3e417e2
@martaribeiro
Merge pull request #3339 from DMPRoadmap/issue_3337_default_font_down…
05a5223 
…load_page

Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
@martaribeiro
Merge branch 'development' into add_js_constants_for_research_outputs
fbcd2c9
@martaribeiro
Merge pull request #3334 from DMPRoadmap/add_js_constants_for_researc…
a9e5d8b 
…h_outputs

Added JS constants to be used in the Research Outputs feature
@martaribeiro
Merge branch 'development' into fontawesome-v6
78e7349
@martaribeiro
Merge pull request #3329 from DMPRoadmap/fontawesome-v6
292019e 
Updated fontawesome to V6
@martaribeiro
Merge branch 'development' into main
a0980f4
@martaribeiro
Merge pull request #3325 from nicolasfranck/main
83ad549 
fix typo, probably introduced by v1 code
martaribeiro and others added 12 commits October 16, 2023 16:23
@martaribeiro
Merge branch 'development' into issue3316
79a8384
@martaribeiro
Merge pull request #3320 from DMPRoadmap/issue3316
c1b3e54 
Issue 3316
@martaribeiro
Merge branch 'development' into cssbundling-deploy-fix
db6ac9b
@martaribeiro
Merge pull request #3314 from DMPRoadmap/cssbundling-deploy-fix
ebe76db 
added .gitkeep file to assets/builds to address issues in production …
@martaribeiro
Merge branch 'development' into add_error_message
64eef3a
@martaribeiro
Merge pull request #3232 from DMPRoadmap/add_error_message
9ab03b7 
Add error message and update saving message for plan writing
Update Gemfile.lock and yarn.lock
6ed6960
@martaribeiro
Merge pull request #3351 from DMPRoadmap/4.1.1-gem-and-yarn
3652114 
Update Gemfile.lock and yarn.lock
@martaribeiro
Revert "Update Gemfile.lock and yarn.lock"
c375492
@martaribeiro
Merge pull request #3352 from DMPRoadmap/revert-3351-4.1.1-gem-and-yarn
a644ed2 
Revert "Update Gemfile.lock and yarn.lock"
Update tp gems.
dd6cba3
@martaribeiro
Merge pull request #3353 from DMPRoadmap/4.1.1-bundle-update
ba149a0 
Update tp gems.
@martaribeiro martaribeiro merged commit 8a0d0fb into main Oct 16, 2023
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@martaribeiro @pengyin-shan @briri @benjaminfaure @nicolasfranck @gjacob24 @dstuckey-uoe