Merge branch 'newb' into 'master'
Newb See merge request !98
No related branches found
No related tags found
Showing
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 0 additions, 6 deletionsGemfile.lock
- app/assets/javascripts/application/accessibility.js 11 additions, 5 deletionsapp/assets/javascripts/application/accessibility.js
- app/assets/stylesheets/application.scss 106 additions, 82 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/application/welcome.scss 10 additions, 0 deletionsapp/assets/stylesheets/application/welcome.scss
- app/views/collections/_collection.html.erb 13 additions, 3 deletionsapp/views/collections/_collection.html.erb
- app/views/collections/_create.html.erb 2 additions, 0 deletionsapp/views/collections/_create.html.erb
- app/views/collections/_form.html.erb 2 additions, 0 deletionsapp/views/collections/_form.html.erb
- app/views/collections/_group.html.erb 1 addition, 1 deletionapp/views/collections/_group.html.erb
- app/views/devise/registrations/edit.html.erb 2 additions, 2 deletionsapp/views/devise/registrations/edit.html.erb
- app/views/devise/sessions/new.html.erb 1 addition, 1 deletionapp/views/devise/sessions/new.html.erb
- app/views/learning_objects/_add_to_collection_popover.html.erb 4 additions, 1 deletion...iews/learning_objects/_add_to_collection_popover.html.erb
- app/views/shared/application/_footer.html.erb 10 additions, 11 deletionsapp/views/shared/application/_footer.html.erb
- app/views/shared/application/_header.html.erb 6 additions, 5 deletionsapp/views/shared/application/_header.html.erb
- app/views/welcome/add_file.html.erb 12 additions, 10 deletionsapp/views/welcome/add_file.html.erb
- app/views/welcome/collection.html.erb 4 additions, 4 deletionsapp/views/welcome/collection.html.erb
- app/views/welcome/index.html.erb 5 additions, 5 deletionsapp/views/welcome/index.html.erb
- public/system/users/avatars/000/000/001/medium/singup.png 0 additions, 0 deletionspublic/system/users/avatars/000/000/001/medium/singup.png
- public/system/users/avatars/000/000/001/original/singup.png 0 additions, 0 deletionspublic/system/users/avatars/000/000/001/original/singup.png
- public/system/users/avatars/000/000/001/thumb/singup.png 0 additions, 0 deletionspublic/system/users/avatars/000/000/001/thumb/singup.png
Loading
Please register or sign in to comment