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.

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

Upgrade 4.2.0 fixes #99

Merged
merged 22 commits into from
Aug 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
91ba096
update local change log: main javascript file
nicolasfranck May 30, 2024
b556731
remove branded view app/views/branded/shared/export/_plan.erb as it i…
nicolasfranck May 30, 2024
78005b9
remove app/views/branded/shared/export/_plan.erb from local change lo…
nicolasfranck May 30, 2024
ef84df3
reintroduce our own multi-phase-download implementation (choose multi…
nicolasfranck May 30, 2024
9b0111c
phase_id as array needs brackets
nicolasfranck May 30, 2024
d180765
make our own multi phase download work again
nicolasfranck May 30, 2024
aa4240f
go back to our own txt plan export
nicolasfranck May 30, 2024
8bf04b5
update branded view to reflect bootstrap changes
nicolasfranck May 30, 2024
9f97c29
plan edit: do not show black left border when comments are shown by d…
nicolasfranck May 30, 2024
3d1bae8
add mt-20 above title as h2 does not do that anymore
nicolasfranck May 30, 2024
7b5d3f7
update branded view to reflect bootstrap 5
nicolasfranck May 30, 2024
f1d2b56
make fields name and abbreviation required again in html input
nicolasfranck May 30, 2024
26cca76
plans/index: replace bootstrap 3 well by card and update data-toggle
nicolasfranck Jun 10, 2024
74862f7
fix layout login page
nicolasfranck Jun 10, 2024
2601dc3
switch edit: update to bootstrap 5 classes
nicolasfranck Jun 10, 2024
2b9e8be
profile page: update to bootstrap 5 classes
nicolasfranck Jun 10, 2024
9f529a2
swich user: use form-control
nicolasfranck Jun 10, 2024
baf3166
select user after orcid login: update to bootstrap 5 classes
nicolasfranck Jun 10, 2024
82da912
remove old css fix for enlarging buttons
nicolasfranck Jun 10, 2024
33d33a2
local css override: remove navbar color override for now
nicolasfranck Jun 10, 2024
65edba2
remove deprecation warning about use of WickedPdf.config method
nicolasfranck Jun 10, 2024
c1fbd66
update local change log
nicolasfranck Jun 10, 2024
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
Prev Previous commit
Next Next commit
add mt-20 above title as h2 does not do that anymore
nicolasfranck committed May 30, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 3d1bae84c1421456cc997c9ad16fed0c3de8a67e
2 changes: 1 addition & 1 deletion app/views/branded/plans/index.html.erb
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
</div>
<% end %>
<div class="row">
<div class="col-md-12">
<div class="col-md-12 mt-20">
<% if @organisationally_or_publicly_visible.any? && !current_user.org.is_other? %>
<h2><%= _('%{org_title} Plans') % { :org_title => current_user.org.name } %></h2>
<p><%= _('The table below lists the plans that users at your organisation have created and shared within your organisation. This allows you to download a PDF and view their plans as samples or to discover new research data.') %></p>