Merge branch 'main' into block-feature

Gemfile

Gemfile.lock

app/assets/javascripts/admin/appstack.js

app/assets/javascripts/admin/plugins/codemirror.js

app/assets/javascripts/admin/plugins/sortable.js

app/assets/javascripts/admin/pure.js

app/assets/javascripts/application.js

app/assets/javascripts/devise.js

app/assets/javascripts/extranet.js

app/assets/stylesheets/admin/appstack.sass

app/assets/stylesheets/admin/pure.sass

app/assets/stylesheets/admin/pure/grid.sass

app/assets/stylesheets/admin/pure/variables.sass

app/assets/stylesheets/application.sass

app/assets/stylesheets/extranet.sass

app/controllers/admin/application_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/research/journals/papers_controller.rb

...ers/admin/research/laboratories/application_controller.rb

app/controllers/admin/research/laboratories_controller.rb