merge main

Gemfile

Gemfile.lock

...lers/admin/communication/extranets/contacts_controller.rb

...controllers/admin/research/journals/volumes_controller.rb

...s/admin/university/organizations/categories_controller.rb

app/controllers/admin/university/organizations_controller.rb

...trollers/admin/university/people/categories_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/extranet/application_controller.rb

app/controllers/extranet/contacts/persons_controller.rb

app/controllers/extranet/contacts/search_controller.rb

app/models/ability.rb

app/models/communication/extranet.rb

app/models/communication/extranet/with_connections.rb

app/models/university/organization.rb

app/models/university/organization/category.rb

app/models/university/person.rb

app/models/university/person/category.rb

app/models/university/with_people_and_organizations.rb

app/models/user/with_registration_context.rb