Merge branch 'master' into generate-thumbnails
Conflicts: app/repositories/orient_db/learning_object_repository.rb config/routes.rb
No related branches found
No related tags found
Showing
- app/controllers/application_controller.rb 2 additions, 4 deletionsapp/controllers/application_controller.rb
- app/controllers/collections_controller.rb 6 additions, 14 deletionsapp/controllers/collections_controller.rb
- app/controllers/institutions_controller.rb 0 additions, 6 deletionsapp/controllers/institutions_controller.rb
- app/controllers/learning_objects_controller.rb 1 addition, 5 deletionsapp/controllers/learning_objects_controller.rb
- app/controllers/management/carousels_controller.rb 55 additions, 0 deletionsapp/controllers/management/carousels_controller.rb
- app/controllers/management/highlights_controller.rb 0 additions, 40 deletionsapp/controllers/management/highlights_controller.rb
- app/controllers/management/users_controller.rb 1 addition, 5 deletionsapp/controllers/management/users_controller.rb
- app/controllers/management_controller.rb 2 additions, 0 deletionsapp/controllers/management_controller.rb
- app/controllers/subjects_controller.rb 22 additions, 0 deletionsapp/controllers/subjects_controller.rb
- app/controllers/users_controller.rb 7 additions, 0 deletionsapp/controllers/users_controller.rb
- app/controllers/welcome_controller.rb 25 additions, 0 deletionsapp/controllers/welcome_controller.rb
- app/helpers/collections_helper.rb 9 additions, 0 deletionsapp/helpers/collections_helper.rb
- app/helpers/learning_objects_helper.rb 20 additions, 0 deletionsapp/helpers/learning_objects_helper.rb
- app/helpers/management/carousel_helper.rb 2 additions, 0 deletionsapp/helpers/management/carousel_helper.rb
- app/models/attribute.rb 6 additions, 0 deletionsapp/models/attribute.rb
- app/models/carousel.rb 7 additions, 0 deletionsapp/models/carousel.rb
- app/models/learning_object.rb 21 additions, 7 deletionsapp/models/learning_object.rb
- app/models/search.rb 21 additions, 0 deletionsapp/models/search.rb
- app/models/subject.rb 8 additions, 1 deletionapp/models/subject.rb
- app/models/user.rb 1 addition, 1 deletionapp/models/user.rb
Loading
Please register or sign in to comment