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

b1c35d23

Commit b1c35d23 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 95efd9c0 cbcb1d53

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/images/icons/Copiar_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Copiar_Seleção.png
app/assets/images/icons/Download_01.png 0 additions, 0 deletions

app/assets/images/icons/Download_01.png
app/assets/images/icons/Mover_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Mover_Seleção.png
app/assets/images/icons/Remover_da_Coleção_Seleção.png 0 additions, 0 deletions

app/assets/images/icons/Remover_da_Coleção_Seleção.png
app/assets/stylesheets/application.scss 13 additions, 5 deletions

app/assets/stylesheets/application.scss
app/views/devise/registrations/edit.html.erb 59 additions, 45 deletions

app/views/devise/registrations/edit.html.erb
app/views/devise/sessions/new.html.erb 34 additions, 21 deletions

app/views/devise/sessions/new.html.erb
app/views/shared/application/_links.html.erb 2 additions, 4 deletions

app/views/shared/application/_links.html.erb
app/views/welcome/account.html.erb 0 additions, 56 deletions

app/views/welcome/account.html.erb
app/views/welcome/add_file.html.erb 40 additions, 5 deletions

app/views/welcome/add_file.html.erb
app/views/welcome/collection.html.erb 7 additions, 7 deletions

app/views/welcome/collection.html.erb
app/views/welcome/follow_collection.html.erb 64 additions, 0 deletions

app/views/welcome/follow_collection.html.erb
config/routes.rb 1 addition, 1 deletion

config/routes.rb

with 220 additions and 144 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