Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

Admin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

215255fb

Commit 215255fb authored 2 years ago by Olivia Simonet

Downloads
- Plain Diff

Merge branch 'refactor/blocks' of github.com:noesya/osuny into refactor/blocks

parents 5a301b26 bcf9159e

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/admin.js 1 addition, 1 deletion

app/assets/javascripts/admin.js
app/assets/stylesheets/admin.sass 1 addition, 1 deletion

app/assets/stylesheets/admin.sass
app/assets/stylesheets/commons/_summernote.sass 6 additions, 0 deletions

app/assets/stylesheets/commons/_summernote.sass
app/models/communication/block/component/rich_text.rb 1 addition, 1 deletion

app/models/communication/block/component/rich_text.rb
app/models/communication/block/template/embed.rb 1 addition, 0 deletions

app/models/communication/block/template/embed.rb
app/views/admin/communication/blocks/templates/embed/_edit.html.erb 3 additions, 2 deletions

...admin/communication/blocks/templates/embed/_edit.html.erb
config/locales/communication/fr.yml 5 additions, 2 deletions

config/locales/communication/fr.yml

with 18 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment