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

bef33eb4

Commit bef33eb4 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 40f98e25 ab5a5d59

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/builders/learning_object/draft_builder.rb 2 additions, 1 deletion

app/builders/learning_object/draft_builder.rb
app/controllers/reviews_controller.rb 3 additions, 3 deletions

app/controllers/reviews_controller.rb
app/models/concerns/stateful.rb 4 additions, 0 deletions

app/models/concerns/stateful.rb
app/models/learning_object.rb 2 additions, 2 deletions

app/models/learning_object.rb
app/services/learning_object_publisher.rb 1 addition, 1 deletion

app/services/learning_object_publisher.rb
app/views/about/_about_text.html.erb 82 additions, 0 deletions

app/views/about/_about_text.html.erb
app/views/about/index.html.erb 2 additions, 85 deletions

app/views/about/index.html.erb
app/views/institutions/_form.html.erb 1 addition, 1 deletion

app/views/institutions/_form.html.erb
app/views/learning_objects/_form.html.erb 2 additions, 2 deletions

app/views/learning_objects/_form.html.erb
app/views/management/institutions/_form.html.erb 1 addition, 1 deletion

app/views/management/institutions/_form.html.erb
config/locales/pt-BR.yml 20 additions, 1 deletion

config/locales/pt-BR.yml

with 120 additions and 97 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