Merge branch 'master' into fixing-statistics
Showing
- Gemfile 1 addition, 1 deletionGemfile
- app/builders/learning_object_builder.rb 12 additions, 12 deletionsapp/builders/learning_object_builder.rb
- app/controllers/management/users_controller.rb 17 additions, 0 deletionsapp/controllers/management/users_controller.rb
- app/controllers/welcome_controller.rb 1 addition, 9 deletionsapp/controllers/welcome_controller.rb
- app/models/collection.rb 1 addition, 0 deletionsapp/models/collection.rb
- app/models/learning_object.rb 3 additions, 2 deletionsapp/models/learning_object.rb
- app/models/subject.rb 11 additions, 1 deletionapp/models/subject.rb
- app/repositories/orient_db/base.rb 12 additions, 22 deletionsapp/repositories/orient_db/base.rb
- app/repositories/orient_db/institution_repository.rb 1 addition, 1 deletionapp/repositories/orient_db/institution_repository.rb
- app/repositories/orient_db/learning_object_repository.rb 30 additions, 157 deletionsapp/repositories/orient_db/learning_object_repository.rb
- app/repositories/orient_db/main_page_repository.rb 0 additions, 35 deletionsapp/repositories/orient_db/main_page_repository.rb
- app/repositories/orient_db/subject_repository.rb 28 additions, 0 deletionsapp/repositories/orient_db/subject_repository.rb
- app/repositories/repositories_proxy.rb 0 additions, 4 deletionsapp/repositories/repositories_proxy.rb
- app/views/management/users/admins.html.erb 1 addition, 1 deletionapp/views/management/users/admins.html.erb
- app/views/management/users/curators.html.erb 7 additions, 7 deletionsapp/views/management/users/curators.html.erb
- app/views/shared/application/_header.html.erb 1 addition, 1 deletionapp/views/shared/application/_header.html.erb
- app/views/welcome/index.html.erb 0 additions, 9 deletionsapp/views/welcome/index.html.erb
- config/dspace.yml 1 addition, 1 deletionconfig/dspace.yml
- config/initializers/repositories/repositories.rb 0 additions, 3 deletionsconfig/initializers/repositories/repositories.rb
- lib/log/database_logger.rb 36 additions, 0 deletionslib/log/database_logger.rb
Loading
Please register or sign in to comment