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

faec7864

Commit faec7864 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 00633c62 67eddc35

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/collections.coffee 26 additions, 11 deletions

app/assets/javascripts/application/collections.coffee
app/controllers/collections_controller.rb 2 additions, 0 deletions

app/controllers/collections_controller.rb
app/views/collections/_list.html.erb 3 additions, 0 deletions

app/views/collections/_list.html.erb
app/views/collections/show.html.erb 1 addition, 3 deletions

app/views/collections/show.html.erb
app/views/learning_objects/show.html.erb 1 addition, 1 deletion

app/views/learning_objects/show.html.erb

with 33 additions and 15 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