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

bebbf08d

Commit bebbf08d authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents 009235dc 600a3b9c

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application.js 1 addition, 1 deletion

app/assets/javascripts/application.js
app/assets/javascripts/application/collections.coffee 123 additions, 122 deletions

app/assets/javascripts/application/collections.coffee
app/assets/javascripts/application/learning_objects.coffee.erb 0 additions, 47 deletions

...ssets/javascripts/application/learning_objects.coffee.erb
app/controllers/collections_controller.rb 55 additions, 46 deletions

app/controllers/collections_controller.rb
app/models/learning_object.rb 2 additions, 2 deletions

app/models/learning_object.rb
app/views/collections/list.html.erb 2 additions, 2 deletions

app/views/collections/list.html.erb
config/routes.rb 5 additions, 9 deletions

config/routes.rb

with 188 additions and 229 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