Merge branch 'master' into upgrade/rails-7
No related branches found
No related tags found
Showing
- Gemfile.lock 29 additions, 21 deletionsGemfile.lock
- app/assets/stylesheets/commons/_summernote.sass 6 additions, 1 deletionapp/assets/stylesheets/commons/_summernote.sass
- app/controllers/admin/university/alumni/cohorts_controller.rb 1 addition, 1 deletion...controllers/admin/university/alumni/cohorts_controller.rb
- app/models/communication/website.rb 4 additions, 4 deletionsapp/models/communication/website.rb
- app/models/communication/website/category.rb 1 addition, 0 deletionsapp/models/communication/website/category.rb
- app/models/communication/website/page/with_path.rb 1 addition, 1 deletionapp/models/communication/website/page/with_path.rb
- app/models/communication/website/post.rb 1 addition, 1 deletionapp/models/communication/website/post.rb
- app/models/education/cohort.rb 9 additions, 2 deletionsapp/models/education/cohort.rb
- app/models/education/diploma.rb 7 additions, 3 deletionsapp/models/education/diploma.rb
- app/models/education/school.rb 6 additions, 6 deletionsapp/models/education/school.rb
- app/models/research/journal.rb 3 additions, 3 deletionsapp/models/research/journal.rb
- app/models/university/organization.rb 1 addition, 1 deletionapp/models/university/organization.rb
- app/models/university/person.rb 5 additions, 11 deletionsapp/models/university/person.rb
- app/models/university/person/with_education.rb 1 addition, 1 deletionapp/models/university/person/with_education.rb
- app/services/importers/alumni_cohorts.rb 11 additions, 4 deletionsapp/services/importers/alumni_cohorts.rb
- app/views/admin/application/_dependencies.html.erb 8 additions, 10 deletionsapp/views/admin/application/_dependencies.html.erb
- app/views/admin/communication/blocks/components/image/_preview.html.erb 1 addition, 1 deletion...n/communication/blocks/components/image/_preview.html.erb
- app/views/admin/communication/websites/categories/show.html.erb 1 addition, 0 deletions...ews/admin/communication/websites/categories/show.html.erb
- app/views/admin/communication/websites/categories/static.html.erb 1 addition, 0 deletions...s/admin/communication/websites/categories/static.html.erb
- app/views/admin/communication/websites/pages/show.html.erb 23 additions, 27 deletionsapp/views/admin/communication/websites/pages/show.html.erb
Loading
Please register or sign in to comment