Merge branch 'main' into extranet/blocks
Showing
- app/controllers/admin/users_controller.rb 1 addition, 1 deletionapp/controllers/admin/users_controller.rb
- app/controllers/extranet/account_controller.rb 1 addition, 1 deletionapp/controllers/extranet/account_controller.rb
- app/controllers/users/registrations_controller.rb 1 addition, 1 deletionapp/controllers/users/registrations_controller.rb
- app/models/communication/extranet/with_sso.rb 1 addition, 1 deletionapp/models/communication/extranet/with_sso.rb
- app/models/university/with_sso.rb 1 addition, 1 deletionapp/models/university/with_sso.rb
- app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb 3 additions, 3 deletions...ication/blocks/templates/call_to_action/_preview.html.erb
- app/views/admin/communication/blocks/templates/chapter/_preview.html.erb 5 additions, 5 deletions.../communication/blocks/templates/chapter/_preview.html.erb
- app/views/admin/communication/blocks/templates/contact/_preview.html.erb 6 additions, 6 deletions.../communication/blocks/templates/contact/_preview.html.erb
- app/views/admin/communication/blocks/templates/datatable/_preview.html.erb 6 additions, 6 deletions...ommunication/blocks/templates/datatable/_preview.html.erb
- app/views/admin/communication/blocks/templates/definitions/_preview.html.erb 5 additions, 5 deletions...munication/blocks/templates/definitions/_preview.html.erb
- app/views/admin/communication/blocks/templates/files/_preview.html.erb 6 additions, 6 deletions...in/communication/blocks/templates/files/_preview.html.erb
- app/views/admin/communication/blocks/templates/gallery/_preview.html.erb 7 additions, 7 deletions.../communication/blocks/templates/gallery/_preview.html.erb
- app/views/admin/communication/blocks/templates/image/_preview.html.erb 3 additions, 3 deletions...in/communication/blocks/templates/image/_preview.html.erb
- app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb 5 additions, 5 deletions...munication/blocks/templates/key_figures/_preview.html.erb
- app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb 3 additions, 3 deletions...unication/blocks/templates/testimonials/_preview.html.erb
- app/views/admin/communication/blocks/templates/timeline/_preview.html.erb 4 additions, 4 deletions...communication/blocks/templates/timeline/_preview.html.erb
- app/views/admin/communication/blocks/templates/video/_preview.html.erb 2 additions, 2 deletions...in/communication/blocks/templates/video/_preview.html.erb
- app/views/admin/research/laboratories/axes/show.html.erb 1 addition, 1 deletionapp/views/admin/research/laboratories/axes/show.html.erb
Loading
Please register or sign in to comment