Merge branch 'master' into refactor/blocks
Showing
- Gemfile.lock 67 additions, 21 deletionsGemfile.lock
- app/controllers/admin/communication/websites/posts/curations_controller.rb 2 additions, 1 deletion...dmin/communication/websites/posts/curations_controller.rb
- app/controllers/admin/users_controller.rb 1 addition, 0 deletionsapp/controllers/admin/users_controller.rb
- app/models/communication/website/page/with_kind.rb 1 addition, 0 deletionsapp/models/communication/website/page/with_kind.rb
- app/models/communication/website/with_dependencies.rb 4 additions, 0 deletionsapp/models/communication/website/with_dependencies.rb
- app/models/communication/website/with_special_pages.rb 1 addition, 1 deletionapp/models/communication/website/with_special_pages.rb
- app/models/university/person/experience.rb 0 additions, 2 deletionsapp/models/university/person/experience.rb
- app/models/university/person/with_experiences.rb 1 addition, 2 deletionsapp/models/university/person/with_experiences.rb
- app/models/user.rb 1 addition, 0 deletionsapp/models/user.rb
- app/services/curator.rb 1 addition, 1 deletionapp/services/curator.rb
- app/services/filters/admin/users.rb 6 additions, 0 deletionsapp/services/filters/admin/users.rb
- app/views/admin/communication/blocks/_static.html.erb 1 addition, 1 deletionapp/views/admin/communication/blocks/_static.html.erb
- app/views/admin/communication/blocks/templates/call_to_action/_static.html.erb 4 additions, 2 deletions...nication/blocks/templates/call_to_action/_static.html.erb
- app/views/admin/communication/blocks/templates/files/_static.html.erb 2 additions, 1 deletion...min/communication/blocks/templates/files/_static.html.erb
- app/views/admin/education/teachers/_list.html.erb 8 additions, 1 deletionapp/views/admin/education/teachers/_list.html.erb
- app/views/admin/research/researchers/index.html.erb 5 additions, 0 deletionsapp/views/admin/research/researchers/index.html.erb
- app/views/admin/university/alumni/_list.html.erb 11 additions, 2 deletionsapp/views/admin/university/alumni/_list.html.erb
- app/views/admin/university/alumni/show.html.erb 1 addition, 1 deletionapp/views/admin/university/alumni/show.html.erb
- app/views/admin/users/index.html.erb 2 additions, 8 deletionsapp/views/admin/users/index.html.erb
- config/locales/communication/en.yml 5 additions, 0 deletionsconfig/locales/communication/en.yml
Loading
Please register or sign in to comment