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

Upgrade 4.2.0 fixes #99

Merged
merged 22 commits into from
Aug 8, 2024
Merged

Upgrade 4.2.0 fixes #99

merged 22 commits into from
Aug 8, 2024

Conversation

nicolasfranck
Copy link
Collaborator

@nicolasfranck nicolasfranck commented May 31, 2024 •
edited
Loading

Notes:

  • removed local css changes for the color of the navigation bar. This to ensure that all colours fit together with new color pallet. Can be changed in the future. See https://github.com/DMPbelgium/roadmap/blob/master/app/assets/stylesheets/ugent/_override.scss
  • removed branded views that were no longer necessary (upstream changes merged)
  • fixed broken multi phase plan export (our changes were not in line anymore with the upstream code)
  • fixed layout login page. You may work on this a little more, but the global layout should be ok.
  • updated change log
  • rebuild assets

@nicolasfranck
update local change log: main javascript file
91ba096
@nicolasfranck
remove branded view app/views/branded/shared/export/_plan.erb as it i…
b556731 
…s the same now
@nicolasfranck
remove app/views/branded/shared/export/_plan.erb from local change lo…
78005b9 
…g now that it is removed
@nicolasfranck
reintroduce our own multi-phase-download implementation (choose multi…
ef84df3 
…ple to download instead of all or nothing)
@nicolasfranck
phase_id as array needs brackets
9b0111c
@nicolasfranck
make our own multi phase download work again
d180765
@nicolasfranck
go back to our own txt plan export
aa4240f
@nicolasfranck
update branded view to reflect bootstrap changes
8bf04b5
@nicolasfranck
plan edit: do not show black left border when comments are shown by d…
9f97c29 
…efault
@nicolasfranck
add mt-20 above title as h2 does not do that anymore
3d1bae8
@nicolasfranck
update branded view to reflect bootstrap 5
7b5d3f7
@nicolasfranck
make fields name and abbreviation required again in html input
f1d2b56
@nicolasfranck
plans/index: replace bootstrap 3 well by card and update data-toggle
26cca76
@nicolasfranck
fix layout login page
74862f7
@nicolasfranck
switch edit: update to bootstrap 5 classes
2601dc3
@nicolasfranck
profile page: update to bootstrap 5 classes
2b9e8be
@nicolasfranck
swich user: use form-control
9f529a2
@nicolasfranck
select user after orcid login: update to bootstrap 5 classes
baf3166
@nicolasfranck
remove old css fix for enlarging buttons
82da912
@nicolasfranck
local css override: remove navbar color override for now
33d33a2
@nicolasfranck
remove deprecation warning about use of WickedPdf.config method
65edba2
@nicolasfranck
update local change log
c1fbd66
@nicolasfranck nicolasfranck marked this pull request as ready for review June 10, 2024 11:45
@StCyr
Copy link
Collaborator

StCyr commented Jun 11, 2024

test.dmponline.be is now running on this branch

@StCyr StCyr merged commit f26444a into master Aug 8, 2024
2 of 9 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.
2 participants
@nicolasfranck @StCyr