merge fix-social-merge
No related branches found
No related tags found
Showing
- Gemfile 6 additions, 0 deletionsGemfile
- app/assets/javascripts/application.js 1 addition, 0 deletionsapp/assets/javascripts/application.js
- app/assets/stylesheets/application.scss 1 addition, 0 deletionsapp/assets/stylesheets/application.scss
- app/controllers/callbacks_controller.rb 33 additions, 0 deletionsapp/controllers/callbacks_controller.rb
- app/helpers/learning_objects_helper.rb 15 additions, 0 deletionsapp/helpers/learning_objects_helper.rb
- app/models/user.rb 24 additions, 1 deletionapp/models/user.rb
- app/views/devise/sessions/new.html.erb 56 additions, 49 deletionsapp/views/devise/sessions/new.html.erb
- app/views/devise/shared/_links.html.erb 6 additions, 2 deletionsapp/views/devise/shared/_links.html.erb
- app/views/layouts/application.html.erb 1 addition, 0 deletionsapp/views/layouts/application.html.erb
- app/views/learning_objects/_share_modal.html.erb 18 additions, 0 deletionsapp/views/learning_objects/_share_modal.html.erb
- app/views/learning_objects/show.html.erb 10 additions, 3 deletionsapp/views/learning_objects/show.html.erb
- app/views/users/_header.html.erb 3 additions, 1 deletionapp/views/users/_header.html.erb
- config/initializers/devise.rb 4 additions, 1 deletionconfig/initializers/devise.rb
- config/initializers/social_share_button.rb 3 additions, 0 deletionsconfig/initializers/social_share_button.rb
- config/locales/pt-BR.yml 20 additions, 1 deletionconfig/locales/pt-BR.yml
- config/routes.rb 1 addition, 1 deletionconfig/routes.rb
Loading
Please register or sign in to comment