Merge branch 'main' into website-csp-config
Showing
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 11 additions, 12 deletionsGemfile.lock
- app/assets/images/communication/blocks/templates/agenda/large.png 0 additions, 0 deletions...ts/images/communication/blocks/templates/agenda/large.png
- app/assets/stylesheets/admin/commons/offcanvas.sass 4 additions, 0 deletionsapp/assets/stylesheets/admin/commons/offcanvas.sass
- app/assets/stylesheets/extranet/layout/_nav.sass 1 addition, 1 deletionapp/assets/stylesheets/extranet/layout/_nav.sass
- app/assets/stylesheets/extranet/pages/_devise.sass 1 addition, 1 deletionapp/assets/stylesheets/extranet/pages/_devise.sass
- app/controllers/admin/communication/websites/permalinks_controller.rb 8 additions, 0 deletions...ers/admin/communication/websites/permalinks_controller.rb
- app/controllers/admin/communication/websites/posts/curations_controller.rb 1 addition, 1 deletion...dmin/communication/websites/posts/curations_controller.rb
- app/controllers/admin/communication/websites_controller.rb 6 additions, 0 deletionsapp/controllers/admin/communication/websites_controller.rb
- app/controllers/api/osuny/application_controller.rb 2 additions, 0 deletionsapp/controllers/api/osuny/application_controller.rb
- app/controllers/api/osuny/communication/websites/application_controller.rb 9 additions, 0 deletions...pi/osuny/communication/websites/application_controller.rb
- app/controllers/api/osuny/communication/websites/pages_controller.rb 11 additions, 0 deletions...lers/api/osuny/communication/websites/pages_controller.rb
- app/controllers/api/osuny/communication/websites/posts_controller.rb 4 additions, 58 deletions...lers/api/osuny/communication/websites/posts_controller.rb
- app/controllers/server/application_controller.rb 1 addition, 1 deletionapp/controllers/server/application_controller.rb
- app/controllers/server/websites_controller.rb 17 additions, 2 deletionsapp/controllers/server/websites_controller.rb
- app/mailers/notification_mailer.rb 10 additions, 0 deletionsapp/mailers/notification_mailer.rb
- app/models/communication/block/template/agenda.rb 15 additions, 20 deletionsapp/models/communication/block/template/agenda.rb
- app/models/communication/extranet.rb 28 additions, 29 deletionsapp/models/communication/extranet.rb
- app/models/communication/website.rb 31 additions, 0 deletionsapp/models/communication/website.rb
- app/models/communication/website/agenda/event.rb 11 additions, 1 deletionapp/models/communication/website/agenda/event.rb
Loading
Please register or sign in to comment