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

e6c68ba2

Commit e6c68ba2 authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

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

parents 23039388 de6e5534

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application.js 23 additions, 0 deletions

app/assets/javascripts/application.js
app/assets/javascripts/application/learning_objects.coffee.erb 14 additions, 0 deletions

...ssets/javascripts/application/learning_objects.coffee.erb
app/controllers/learning_objects_controller.rb 8 additions, 1 deletion

app/controllers/learning_objects_controller.rb
app/policies/learning_object_policy.rb 4 additions, 0 deletions

app/policies/learning_object_policy.rb
app/views/learning_objects/_bookmarks_button.html.erb 8 additions, 2 deletions

app/views/learning_objects/_bookmarks_button.html.erb
app/views/learning_objects/_like_button.html.erb 8 additions, 2 deletions

app/views/learning_objects/_like_button.html.erb
app/views/learning_objects/build/_file_upload_form.html.erb 199 additions, 188 deletions

app/views/learning_objects/build/_file_upload_form.html.erb
app/views/learning_objects/build/select_thumbnail.html.erb 6 additions, 2 deletions

app/views/learning_objects/build/select_thumbnail.html.erb
app/views/learning_objects/show.html.erb 12 additions, 5 deletions

app/views/learning_objects/show.html.erb
app/views/users/show.html.erb 6 additions, 2 deletions

app/views/users/show.html.erb
config/routes.rb 1 addition, 1 deletion

config/routes.rb

with 289 additions and 203 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