merge from master
Signed-off-by:
Alexandre Arias <apa13@inf.ufpr.br>
No related branches found
No related tags found
Showing
- app/assets/javascripts/application/accessibility.js 9 additions, 18 deletionsapp/assets/javascripts/application/accessibility.js
- app/assets/javascripts/application/search.js 32 additions, 35 deletionsapp/assets/javascripts/application/search.js
- app/assets/stylesheets/application/search.scss 14 additions, 105 deletionsapp/assets/stylesheets/application/search.scss
- app/controllers/search_controller.rb 4 additions, 3 deletionsapp/controllers/search_controller.rb
- app/controllers/users_controller.rb 12 additions, 17 deletionsapp/controllers/users_controller.rb
- app/helpers/users_helper.rb 7 additions, 0 deletionsapp/helpers/users_helper.rb
- app/models/collection.rb 5 additions, 5 deletionsapp/models/collection.rb
- app/repositories/orient_db/collection_repository.rb 12 additions, 8 deletionsapp/repositories/orient_db/collection_repository.rb
- app/repositories/orient_db/learning_object_repository.rb 25 additions, 14 deletionsapp/repositories/orient_db/learning_object_repository.rb
- app/views/bookmarks/_bookmarks.html.erb 4 additions, 0 deletionsapp/views/bookmarks/_bookmarks.html.erb
- app/views/collections/show.html.erb 28 additions, 25 deletionsapp/views/collections/show.html.erb
- app/views/layouts/application.html.erb 1 addition, 1 deletionapp/views/layouts/application.html.erb
- app/views/search/_fetch.html.erb 2 additions, 1 deletionapp/views/search/_fetch.html.erb
- app/views/search/index.html.erb 11 additions, 14 deletionsapp/views/search/index.html.erb
- app/views/users/me.html.erb 9 additions, 10 deletionsapp/views/users/me.html.erb
- lib/search_engine/orientdb_lucene.rb 2 additions, 2 deletionslib/search_engine/orientdb_lucene.rb
Loading
Please register or sign in to comment