Merge branch 'feature-edit-lo' of gitlab.c3sl.ufpr.br:portalmec/portalmec into feature-edit-lo
No related branches found
No related tags found
Showing
- app/controllers/learning_objects/build_controller.rb 2 additions, 7 deletionsapp/controllers/learning_objects/build_controller.rb
- app/models/object_type.rb 1 addition, 1 deletionapp/models/object_type.rb
- app/services/learning_object_publisher.rb 2 additions, 2 deletionsapp/services/learning_object_publisher.rb
- app/views/learning_objects/_form.html.erb 0 additions, 1 deletionapp/views/learning_objects/_form.html.erb
- app/views/learning_objects/_link_upload_form.html.erb 0 additions, 9 deletionsapp/views/learning_objects/_link_upload_form.html.erb
- app/views/learning_objects/build/_file_upload_form.html.erb 46 additions, 22 deletionsapp/views/learning_objects/build/_file_upload_form.html.erb
- app/views/learning_objects/build/define_highlight_picture.html.erb 0 additions, 0 deletions.../learning_objects/build/define_highlight_picture.html.erb
- app/views/learning_objects/build/select_default_attachment.html.erb 0 additions, 0 deletions...learning_objects/build/select_default_attachment.html.erb
- app/views/learning_objects/build/upload_attachments.html.erb 1 addition, 3 deletionsapp/views/learning_objects/build/upload_attachments.html.erb
- app/views/learning_objects/upload.html.erb 0 additions, 3 deletionsapp/views/learning_objects/upload.html.erb
- app/views/learning_objects/upload_link.html.erb 0 additions, 3 deletionsapp/views/learning_objects/upload_link.html.erb
- db/migrate/20160301103501_add_paperclip_to_attachments.rb 2 additions, 2 deletionsdb/migrate/20160301103501_add_paperclip_to_attachments.rb
- db/migrate/20160303181501_add_column_mime_type_for_object_types.rb 5 additions, 0 deletions...e/20160303181501_add_column_mime_type_for_object_types.rb
Loading
Please register or sign in to comment