Skip to content

Development #3354

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

Merged
martaribeiro merged 42 commits into from
Oct 16, 2023
Merged

Development #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
35fb4a4
add error message and update saving message for plan writing
pengyin-shan Nov 8, 2022
ade7f8c
use yellow or warnign for saving process
pengyin-shan Nov 8, 2022
e9148b3
Merge branch 'development' into add_error_message
pengyin-shan Nov 29, 2022
d8cd8d4
Merge branch 'development' into add_error_message
pengyin-shan Feb 27, 2023
2295d49
update github action to use node 16 only
pengyin-shan Feb 27, 2023
66522fe
merge development branch
pengyin-shan Feb 27, 2023
60e0a09
add changelog
pengyin-shan Feb 27, 2023
ae24901
Merge branch 'add_error_message' of github.com:DMPRoadmap/roadmap int…
pengyin-shan Feb 27, 2023
5c893ad
Merge branch 'development' into add_error_message
briri Apr 12, 2023
e4f8830
added .gitkeep file to assets/builds to address issues in production …
briri May 1, 2023
d7d64e6
Merge pull request #3312 from DMPRoadmap/main
briri May 1, 2023
927e885
added note to CHANGELOG
briri May 1, 2023
9b73b34
Merge branch 'development' into cssbundling-deploy-fix
briri May 1, 2023
1c7a126
Solved issue where spring was loaded in production mode
benjaminfaure Jun 14, 2023
df693dc
Updated CHANGELOG
benjaminfaure Jun 14, 2023
b2d55c6
fix typo, probably introduced by v1 code
nicolasfranck Jul 13, 2023
b0cbb37
Updated fontawesome to V6
benjaminfaure Jul 18, 2023
76c53a5
Added JS constants to be used in the Research Outputs feature
gjacob24 Aug 4, 2023
488072a
Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
don-stuckey Sep 15, 2023
06bd855
Added entry to in Fixed section for this change.
don-stuckey Sep 15, 2023
5d1281b
Moved the fixed-entry for this issue to the top the CHANGELOG.md file.
don-stuckey Sep 18, 2023
7d163b0
update CHANGELOG.md as requested by closed PR https://github.com/DMPR…
nicolasfranck Sep 18, 2023
3e417e2
Updated missing icons to fontawesome v6
benjaminfaure Oct 16, 2023
05a5223
Merge pull request #3339 from DMPRoadmap/issue_3337_default_font_down…
martaribeiro Oct 16, 2023
fbcd2c9
Merge branch 'development' into add_js_constants_for_research_outputs
martaribeiro Oct 16, 2023
a9e5d8b
Merge pull request #3334 from DMPRoadmap/add_js_constants_for_researc…
martaribeiro Oct 16, 2023
78e7349
Merge branch 'development' into fontawesome-v6
martaribeiro Oct 16, 2023
292019e
Merge pull request #3329 from DMPRoadmap/fontawesome-v6
martaribeiro Oct 16, 2023
a0980f4
Merge branch 'development' into main
martaribeiro Oct 16, 2023
83ad549
Merge pull request #3325 from nicolasfranck/main
martaribeiro Oct 16, 2023
79a8384
Merge branch 'development' into issue3316
martaribeiro Oct 16, 2023
c1b3e54
Merge pull request #3320 from DMPRoadmap/issue3316
martaribeiro Oct 16, 2023
db6ac9b
Merge branch 'development' into cssbundling-deploy-fix
martaribeiro Oct 16, 2023
ebe76db
Merge pull request #3314 from DMPRoadmap/cssbundling-deploy-fix
martaribeiro Oct 16, 2023
64eef3a
Merge branch 'development' into add_error_message
martaribeiro Oct 16, 2023
9ab03b7
Merge pull request #3232 from DMPRoadmap/add_error_message
martaribeiro Oct 16, 2023
6ed6960
Update Gemfile.lock and yarn.lock
Oct 16, 2023
3652114
Merge pull request #3351 from DMPRoadmap/4.1.1-gem-and-yarn
martaribeiro Oct 16, 2023
c375492
Revert "Update Gemfile.lock and yarn.lock"
martaribeiro Oct 16, 2023
a644ed2
Merge pull request #3352 from DMPRoadmap/revert-3351-4.1.1-gem-and-yarn
martaribeiro Oct 16, 2023
dd6cba3
Update tp gems.
Oct 16, 2023
ba149a0
Merge pull request #3353 from DMPRoadmap/4.1.1-bundle-update
martaribeiro Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
with:
ruby-version: '3.0'
bundler-cache: true
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV

## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS

# Install Node
- uses: actions/setup-node@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ yarn-debug.log*
.yarn-integrity
/app/assets/builds/*
!/app/assets/builds/.keep
!/app/assets/builds/.gitkeep

# Ignore briley AWS cloud9 script to start the application
cloud9-start.sh
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## V4.1.1

### Added
- Added `MORE_INFO` and `LESS_INFO` JS constants (for the Research Outputs feature)
- Added a .gitkeep file to the app/assets/builds directory to address potential issues when building the application.css file during production deploys #3314

### Fixed
- Updated the default font on the 'Download page' to be 'Roboto, Arial, Sans-Serif'
- Fixed an issue with API V0 that was causing a 500 Internal Server error
- Solved issue where spring was loaded in production mode : ran `bin/spring binstub --all`
- Updated fontawesome to V6


## v4.1.0

**Note this upgrade is a migration from Ruby v2.7.6 to v3.0.5.** Note that this could have an impact on any customizations you may have made to your fork of this project. Please see https://www.fastruby.io/blog/ruby/upgrades/upgrade-ruby-from-2.7-to-3.0.html for further information on what to check. In particular, please note the changes to the way [Ruby 3 handles keyword arguments](https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/)
Expand Down Expand Up @@ -104,3 +117,4 @@ For more detailed explanation, please refer to this video : https://www.youtube.

- Added scss files to EditorConfig
- Change csv file name for statistics from 'Completed' to 'Created'
- Added error message and updated saving message for plan writing session to improve user experience
Loading