Merge branch 'master' into learning_object-update-permissions
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 22 additions, 8 deletions.gitlab-ci.yml
- README.md 35 additions, 9 deletionsREADME.md
- app/builders/learning_object_builder.rb 33 additions, 1 deletionapp/builders/learning_object_builder.rb
- app/controllers/v1/learning_objects_controller.rb 1 addition, 1 deletionapp/controllers/v1/learning_objects_controller.rb
- app/controllers/v1/search_controller.rb 29 additions, 1 deletionapp/controllers/v1/search_controller.rb
- app/models/collection.rb 15 additions, 0 deletionsapp/models/collection.rb
- app/models/educational_stage.rb 1 addition, 0 deletionsapp/models/educational_stage.rb
- app/models/learning_object.rb 18 additions, 3 deletionsapp/models/learning_object.rb
- app/models/object_type.rb 1 addition, 0 deletionsapp/models/object_type.rb
- app/models/review.rb 6 additions, 1 deletionapp/models/review.rb
- app/models/search.rb 14 additions, 4 deletionsapp/models/search.rb
- app/models/subject.rb 1 addition, 0 deletionsapp/models/subject.rb
- app/models/tag.rb 1 addition, 0 deletionsapp/models/tag.rb
- app/models/user.rb 14 additions, 0 deletionsapp/models/user.rb
- app/serializers/learning_object_obaa_serializer.rb 3 additions, 1 deletionapp/serializers/learning_object_obaa_serializer.rb
- app/serializers/learning_object_serializer.rb 3 additions, 1 deletionapp/serializers/learning_object_serializer.rb
- app/services/search_service/learning_object.rb 7 additions, 0 deletionsapp/services/search_service/learning_object.rb
- app/workers/dspace_upload_worker.rb 3 additions, 0 deletionsapp/workers/dspace_upload_worker.rb
- app/workers/thumbnail_generate_worker.rb 1 addition, 0 deletionsapp/workers/thumbnail_generate_worker.rb
- db/migrate/20190219142846_create_searches.rb 31 additions, 0 deletionsdb/migrate/20190219142846_create_searches.rb
Loading
Please register or sign in to comment