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

811bee48

Commit 811bee48 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 0ec6109b 620bad84

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/collections.coffee 7 additions, 2 deletions

app/assets/javascripts/application/collections.coffee
app/assets/javascripts/application/columns.js 39 additions, 17 deletions

app/assets/javascripts/application/columns.js
app/assets/javascripts/application/notice.coffee 11 additions, 0 deletions

app/assets/javascripts/application/notice.coffee
app/builders/builder.rb 3 additions, 1 deletion

app/builders/builder.rb
app/controllers/management/users_controller.rb 6 additions, 2 deletions

app/controllers/management/users_controller.rb
app/views/collections/show.html.erb 6 additions, 6 deletions

app/views/collections/show.html.erb
app/views/layouts/application.html.erb 3 additions, 1 deletion

app/views/layouts/application.html.erb
app/views/learning_objects/show.html.erb 4 additions, 4 deletions

app/views/learning_objects/show.html.erb
app/views/shared/management/_nav_menu.html.erb 4 additions, 0 deletions

app/views/shared/management/_nav_menu.html.erb

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