Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-interface
Showing
- Gemfile 25 additions, 22 deletionsGemfile
- Gemfile.lock 13 additions, 11 deletionsGemfile.lock
- app/assets/javascripts/application/about.coffee 0 additions, 0 deletionsapp/assets/javascripts/application/about.coffee
- app/assets/stylesheets/application/about.scss 0 additions, 7 deletionsapp/assets/stylesheets/application/about.scss
- app/builders/learning_object/draft_builder.rb 3 additions, 2 deletionsapp/builders/learning_object/draft_builder.rb
- app/builders/learning_object_builder.rb 6 additions, 5 deletionsapp/builders/learning_object_builder.rb
- app/controllers/chunks_controller.rb 2 additions, 3 deletionsapp/controllers/chunks_controller.rb
- app/controllers/learning_objects_controller.rb 1 addition, 1 deletionapp/controllers/learning_objects_controller.rb
- app/helpers/learning_objects_helper.rb 20 additions, 33 deletionsapp/helpers/learning_objects_helper.rb
- app/models/complaint_reason.rb 1 addition, 1 deletionapp/models/complaint_reason.rb
- app/models/learning_object.rb 4 additions, 1 deletionapp/models/learning_object.rb
- app/models/review.rb 2 additions, 2 deletionsapp/models/review.rb
- app/models/score.rb 1 addition, 1 deletionapp/models/score.rb
- app/models/topic.rb 2 additions, 2 deletionsapp/models/topic.rb
- app/models/user_category.rb 1 addition, 1 deletionapp/models/user_category.rb
- app/services/learning_object_publisher.rb 2 additions, 1 deletionapp/services/learning_object_publisher.rb
- app/services/score_calculator_service.rb 3 additions, 1 deletionapp/services/score_calculator_service.rb
- app/services/thumbnail_service.rb 13 additions, 0 deletionsapp/services/thumbnail_service.rb
- app/services/topics_importer.rb 32 additions, 36 deletionsapp/services/topics_importer.rb
- app/views/learning_objects/_file_upload_form.html.erb 0 additions, 1 deletionapp/views/learning_objects/_file_upload_form.html.erb
Loading
Please register or sign in to comment