Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into railsapi
Showing
- .gitignore 5 additions, 0 deletions.gitignore
- Dockerfile 13 additions, 0 deletionsDockerfile
- Gemfile 2 additions, 1 deletionGemfile
- Gemfile.lock 44 additions, 36 deletionsGemfile.lock
- README.md 7 additions, 1 deletionREADME.md
- app/assets/stylesheets/application.scss 11 additions, 153 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/application/learning_objects.scss 10 additions, 0 deletionsapp/assets/stylesheets/application/learning_objects.scss
- app/controllers/chunks_controller.rb 22 additions, 8 deletionsapp/controllers/chunks_controller.rb
- app/controllers/collections_controller.rb 3 additions, 3 deletionsapp/controllers/collections_controller.rb
- app/controllers/complaints_controller.rb 2 additions, 2 deletionsapp/controllers/complaints_controller.rb
- app/controllers/feedbacks_controller.rb 1 addition, 1 deletionapp/controllers/feedbacks_controller.rb
- app/controllers/institutions_controller.rb 3 additions, 3 deletionsapp/controllers/institutions_controller.rb
- app/controllers/learning_objects_controller.rb 3 additions, 3 deletionsapp/controllers/learning_objects_controller.rb
- app/helpers/learning_objects/builder_helper.rb 5 additions, 0 deletionsapp/helpers/learning_objects/builder_helper.rb
- app/views/learning_objects/_learning_object_horizontal.erb 1 addition, 1 deletionapp/views/learning_objects/_learning_object_horizontal.erb
- app/views/learning_objects/_learning_object_vertical.erb 1 addition, 1 deletionapp/views/learning_objects/_learning_object_vertical.erb
- app/views/learning_objects/build/_file_upload_form.html.erb 1 addition, 1 deletionapp/views/learning_objects/build/_file_upload_form.html.erb
- app/views/learning_objects/show.html.erb 8 additions, 4 deletionsapp/views/learning_objects/show.html.erb
- app/views/management/carousels/_form.html.erb 1 addition, 1 deletionapp/views/management/carousels/_form.html.erb
- app/views/management/complaint_reasons/_form.html.erb 1 addition, 1 deletionapp/views/management/complaint_reasons/_form.html.erb
Loading
Please register or sign in to comment