Merge branch 'master' of github.com:noesya/osuny

app/assets/javascripts/admin/commons/users.js

app/controllers/admin/education/teachers_controller.rb

app/controllers/admin/users_controller.rb

app/models/ability.rb

app/models/user/with_roles.rb

app/views/admin/education/programs/show/_roles.html.erb

app/views/admin/education/programs/show/_teachers.html.erb

...ews/admin/education/teachers/_involvement_fields.html.erb

app/views/admin/education/teachers/show.html.erb

app/views/admin/users/_form.html.erb

config/locales/en.yml

config/locales/fr.yml

db/migrate/20220203160802_create_program_user_join_table.rb

db/schema.rb