Merge branch 'master' into feature/blocks-contact-programs
No related branches found
No related tags found
Showing
- Gemfile.lock 80 additions, 84 deletionsGemfile.lock
- app/controllers/admin/communication/websites/pages_controller.rb 1 addition, 1 deletion...trollers/admin/communication/websites/pages_controller.rb
- app/controllers/users/sessions_controller.rb 7 additions, 0 deletionsapp/controllers/users/sessions_controller.rb
- app/mailers/devise_mailer.rb 1 addition, 0 deletionsapp/mailers/devise_mailer.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/configs/base_url.rb 1 addition, 1 deletionapp/models/communication/website/configs/base_url.rb
- app/models/communication/website/configs/permalinks.rb 1 addition, 1 deletionapp/models/communication/website/configs/permalinks.rb
- app/models/communication/website/page.rb 7 additions, 1 deletionapp/models/communication/website/page.rb
- app/models/communication/website/with_style.rb 4 additions, 0 deletionsapp/models/communication/website/with_style.rb
- app/models/education/program.rb 1 addition, 1 deletionapp/models/education/program.rb
- app/models/user/with_authentication.rb 0 additions, 1 deletionapp/models/user/with_authentication.rb
- app/services/sendinblue/sms_service.rb 2 additions, 2 deletionsapp/services/sendinblue/sms_service.rb
- app/views/admin/application/property/_text.html.erb 1 addition, 0 deletionsapp/views/admin/application/property/_text.html.erb
- app/views/admin/communication/blocks/_list.html.erb 36 additions, 28 deletionsapp/views/admin/communication/blocks/_list.html.erb
- app/views/admin/communication/websites/pages/_form.html.erb 1 addition, 0 deletionsapp/views/admin/communication/websites/pages/_form.html.erb
- app/views/admin/communication/websites/pages/show.html.erb 3 additions, 0 deletionsapp/views/admin/communication/websites/pages/show.html.erb
- app/views/admin/communication/websites/pages/static.html.erb 1 addition, 0 deletionsapp/views/admin/communication/websites/pages/static.html.erb
- app/views/admin/communication/websites/posts/show.html.erb 0 additions, 1 deletionapp/views/admin/communication/websites/posts/show.html.erb
- app/views/admin/education/programs/_form.html.erb 2 additions, 2 deletionsapp/views/admin/education/programs/_form.html.erb
Loading
Please register or sign in to comment