Merge branch 'master' into index-pages
No related branches found
No related tags found
Showing
- Gemfile 3 additions, 1 deletionGemfile
- Gemfile.lock 66 additions, 63 deletionsGemfile.lock
- app/assets/javascripts/admin.js 3 additions, 0 deletionsapp/assets/javascripts/admin.js
- app/assets/javascripts/admin/commons/slug_input.js 1 addition, 4 deletionsapp/assets/javascripts/admin/commons/slug_input.js
- app/assets/javascripts/admin/plugins/summernote.js 50 additions, 0 deletionsapp/assets/javascripts/admin/plugins/summernote.js
- app/assets/stylesheets/admin.sass 1 addition, 0 deletionsapp/assets/stylesheets/admin.sass
- app/assets/stylesheets/admin/preview.sass 4 additions, 0 deletionsapp/assets/stylesheets/admin/preview.sass
- app/assets/stylesheets/admin/treeview.sass 14 additions, 6 deletionsapp/assets/stylesheets/admin/treeview.sass
- app/assets/stylesheets/commons/_summernote.sass 10 additions, 0 deletionsapp/assets/stylesheets/commons/_summernote.sass
- app/controllers/admin/communication/website/blocks_controller.rb 70 additions, 0 deletions...trollers/admin/communication/website/blocks_controller.rb
- app/helpers/admin/application_helper.rb 4 additions, 0 deletionsapp/helpers/admin/application_helper.rb
- app/models/administration/qualiopi/indicator.rb 1 addition, 1 deletionapp/models/administration/qualiopi/indicator.rb
- app/models/communication/website.rb 1 addition, 1 deletionapp/models/communication/website.rb
- app/models/communication/website/block.rb 71 additions, 0 deletionsapp/models/communication/website/block.rb
- app/models/communication/website/home.rb 2 additions, 2 deletionsapp/models/communication/website/home.rb
- app/models/communication/website/page.rb 4 additions, 3 deletionsapp/models/communication/website/page.rb
- app/models/communication/website/post.rb 3 additions, 2 deletionsapp/models/communication/website/post.rb
- app/models/communication/website/with_abouts.rb 4 additions, 0 deletionsapp/models/communication/website/with_abouts.rb
- app/models/concerns/with_blobs.rb 12 additions, 7 deletionsapp/models/concerns/with_blobs.rb
- app/models/concerns/with_blocks.rb 11 additions, 0 deletionsapp/models/concerns/with_blocks.rb
Loading
Please register or sign in to comment