Merge branch 'master' into feature-thumbnail-worker
Showing
- Gemfile 0 additions, 2 deletionsGemfile
- Gemfile.lock 22 additions, 35 deletionsGemfile.lock
- app/assets/javascripts/application/autocomplete.js 22 additions, 14 deletionsapp/assets/javascripts/application/autocomplete.js
- app/assets/javascripts/application/search.js 5 additions, 0 deletionsapp/assets/javascripts/application/search.js
- app/assets/javascripts/management.js 32 additions, 3 deletionsapp/assets/javascripts/management.js
- app/assets/javascripts/management/colections.js 19 additions, 39 deletionsapp/assets/javascripts/management/colections.js
- app/assets/javascripts/management/complaints.js 68 additions, 0 deletionsapp/assets/javascripts/management/complaints.js
- app/assets/stylesheets/application/search.scss 4 additions, 0 deletionsapp/assets/stylesheets/application/search.scss
- app/builders/attribute_builder.rb 0 additions, 19 deletionsapp/builders/attribute_builder.rb
- app/builders/bookmarks_builder.rb 0 additions, 18 deletionsapp/builders/bookmarks_builder.rb
- app/builders/builder.rb 0 additions, 47 deletionsapp/builders/builder.rb
- app/builders/collection_builder.rb 0 additions, 29 deletionsapp/builders/collection_builder.rb
- app/builders/complaint_builder.rb 0 additions, 25 deletionsapp/builders/complaint_builder.rb
- app/builders/generic_builder.rb 0 additions, 40 deletionsapp/builders/generic_builder.rb
- app/builders/institution_builder.rb 0 additions, 24 deletionsapp/builders/institution_builder.rb
- app/builders/language_builder.rb 0 additions, 22 deletionsapp/builders/language_builder.rb
- app/builders/learning_object/attachment_builder.rb 0 additions, 39 deletionsapp/builders/learning_object/attachment_builder.rb
- app/builders/learning_object/draft_builder.rb 1 addition, 1 deletionapp/builders/learning_object/draft_builder.rb
- app/builders/learning_object_builder.rb 7 additions, 49 deletionsapp/builders/learning_object_builder.rb
- app/builders/subject_builder.rb 0 additions, 24 deletionsapp/builders/subject_builder.rb
Loading
Please register or sign in to comment