diff --git a/CHANGELOG.md b/CHANGELOG.md index 1484d5638..0c8e2f1f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,12 @@ - Architecture documentation - Improved coupon creation/deletion workflow - Default texts for the login modal +- Updated caniuse to 1.0.30001191 - Fix a bug: unable to access embedded plan views - Fix a bug: warning message overflow in credit wallet modal - Fix a bug: when using a cash coupon, the amount shown in the statistics is invalid - Fix a bug: unable to create a coupon on stripe -- Fix a bug: no notifications for refunds generated on wallet credit +- Fix a bug: no notifications for refunds generated on wallet credit - [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet` - [TODO DEPLOY] `rails fablab:stripe:set_product_id` - [TODO DEPLOY] `rails fablab:setup:add_schedule_reference` diff --git a/app/views/layouts/notifications_mailer.html.erb b/app/views/layouts/notifications_mailer.html.erb index 43ddd5414..ce21d13e9 100644 --- a/app/views/layouts/notifications_mailer.html.erb +++ b/app/views/layouts/notifications_mailer.html.erb @@ -23,9 +23,17 @@ <% if CustomAsset.get_url('logo-file') %> - <%=fablab_name%> + + <%=fablab_name%> + <% else %> - <%=fablab_name%> + + <%=fablab_name%> + <% end %> diff --git a/yarn.lock b/yarn.lock index 5d737137b..69d85fd40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2365,9 +2365,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001124: - version "1.0.30001124" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2" - integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA== + version "1.0.30001191" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz" + integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== case-sensitive-paths-webpack-plugin@^2.3.0: version "2.3.0"