Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ac000c01

Commit ac000c01 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'upload-learning-object' of...

Merge branch 'upload-learning-object' of gitlab.c3sl.ufpr.br:portalmec/portalmec into upload-learning-object

parents 968cba21 5b2cec23

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/learning_object/chunks.coffee 3 additions, 0 deletions

app/assets/javascripts/learning_object/chunks.coffee
app/builders/learning_object/attachment_builder.rb 39 additions, 0 deletions

app/builders/learning_object/attachment_builder.rb
app/builders/learning_object_builder.rb 7 additions, 1 deletion

app/builders/learning_object_builder.rb
app/controllers/learning_object/chunks_controller.rb 66 additions, 0 deletions

app/controllers/learning_object/chunks_controller.rb
app/models/learning_object.rb 7 additions, 6 deletions

app/models/learning_object.rb
app/models/learning_object/attachment.rb 3 additions, 29 deletions

app/models/learning_object/attachment.rb
config/routes.rb 2 additions, 0 deletions

config/routes.rb
test/controllers/learning_object/chunks_controller_test.rb 14 additions, 0 deletions

test/controllers/learning_object/chunks_controller_test.rb

with 141 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment