Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-interface
No related branches found
No related tags found
Showing
- Gemfile 10 additions, 1 deletionGemfile
- Gemfile.lock 74 additions, 34 deletionsGemfile.lock
- app/assets/javascripts/application.js 1 addition, 0 deletionsapp/assets/javascripts/application.js
- app/assets/stylesheets/application.scss 4 additions, 0 deletionsapp/assets/stylesheets/application.scss
- app/builders/learning_object_builder.rb 4 additions, 4 deletionsapp/builders/learning_object_builder.rb
- app/controllers/callbacks_controller.rb 33 additions, 0 deletionsapp/controllers/callbacks_controller.rb
- app/helpers/learning_objects_helper.rb 15 additions, 0 deletionsapp/helpers/learning_objects_helper.rb
- app/models/concerns/reviewable.rb 4 additions, 0 deletionsapp/models/concerns/reviewable.rb
- app/models/score.rb 16 additions, 0 deletionsapp/models/score.rb
- app/models/score_user_category.rb 34 additions, 0 deletionsapp/models/score_user_category.rb
- app/models/topic_relationship.rb 1 addition, 0 deletionsapp/models/topic_relationship.rb
- app/models/user.rb 38 additions, 1 deletionapp/models/user.rb
- app/models/user_category.rb 7 additions, 0 deletionsapp/models/user_category.rb
- app/services/score_calculator_service.rb 49 additions, 0 deletionsapp/services/score_calculator_service.rb
- app/services/topics_importer.rb 16 additions, 10 deletionsapp/services/topics_importer.rb
- app/views/devise/sessions/new.html.erb 56 additions, 49 deletionsapp/views/devise/sessions/new.html.erb
- app/views/devise/shared/_links.html.erb 6 additions, 2 deletionsapp/views/devise/shared/_links.html.erb
- app/views/layouts/application.html.erb 1 addition, 0 deletionsapp/views/layouts/application.html.erb
- app/views/learning_objects/_bookmarks_button.html.erb 1 addition, 1 deletionapp/views/learning_objects/_bookmarks_button.html.erb
- app/views/learning_objects/_collections_button.html.erb 1 addition, 1 deletionapp/views/learning_objects/_collections_button.html.erb
Loading
Please register or sign in to comment