Merge branch 'main' into remove_actiontext_summernote
No related branches found
No related tags found
Showing
- Gemfile 2 additions, 0 deletionsGemfile
- Gemfile.lock 15 additions, 0 deletionsGemfile.lock
- app/assets/images/admin/administration-thumb.jpg 0 additions, 0 deletionsapp/assets/images/admin/administration-thumb.jpg
- app/assets/images/admin/administration.jpg 0 additions, 0 deletionsapp/assets/images/admin/administration.jpg
- app/assets/images/admin/communication-thumb.jpg 0 additions, 0 deletionsapp/assets/images/admin/communication-thumb.jpg
- app/assets/images/admin/communication.jpg 0 additions, 0 deletionsapp/assets/images/admin/communication.jpg
- app/assets/images/admin/education-thumb.jpg 0 additions, 0 deletionsapp/assets/images/admin/education-thumb.jpg
- app/assets/images/admin/education.jpg 0 additions, 0 deletionsapp/assets/images/admin/education.jpg
- app/assets/images/admin/research-thumb.jpg 0 additions, 0 deletionsapp/assets/images/admin/research-thumb.jpg
- app/assets/images/admin/research.jpg 0 additions, 0 deletionsapp/assets/images/admin/research.jpg
- app/assets/images/admin/university-thumb.jpg 0 additions, 0 deletionsapp/assets/images/admin/university-thumb.jpg
- app/assets/images/admin/university.jpg 0 additions, 0 deletionsapp/assets/images/admin/university.jpg
- app/assets/images/avatar.jpg 0 additions, 0 deletionsapp/assets/images/avatar.jpg
- app/assets/javascripts/admin/communication/websites.js 4 additions, 2 deletionsapp/assets/javascripts/admin/communication/websites.js
- app/assets/stylesheets/admin/appstack/style.sass 6 additions, 2 deletionsapp/assets/stylesheets/admin/appstack/style.sass
- app/assets/stylesheets/admin/commons/table.sass 2 additions, 1 deletionapp/assets/stylesheets/admin/commons/table.sass
- app/assets/stylesheets/admin/pure/navigation.sass 8 additions, 7 deletionsapp/assets/stylesheets/admin/pure/navigation.sass
- app/assets/stylesheets/admin/pure/style.sass 5 additions, 1 deletionapp/assets/stylesheets/admin/pure/style.sass
- app/controllers/admin/administration/application_controller.rb 4 additions, 1 deletion...ontrollers/admin/administration/application_controller.rb
- app/controllers/admin/administration/dashboard_controller.rb 9 additions, 0 deletionsapp/controllers/admin/administration/dashboard_controller.rb
Loading
Please register or sign in to comment