Merge branch 'master' of github.com:noesya/osuny
No related branches found
No related tags found
Showing
- Gemfile 2 additions, 1 deletionGemfile
- Gemfile.lock 13 additions, 8 deletionsGemfile.lock
- app/assets/stylesheets/extranet/_default/abstracts/_variables.sass 2 additions, 2 deletions...s/stylesheets/extranet/_default/abstracts/_variables.sass
- app/assets/stylesheets/extranet/_default/components/_facets.sass 1 addition, 1 deletion...ets/stylesheets/extranet/_default/components/_facets.sass
- app/assets/stylesheets/extranet/_default/components/_list.sass 2 additions, 2 deletions...ssets/stylesheets/extranet/_default/components/_list.sass
- app/assets/stylesheets/extranet/_default/components/_pagination.sass 5 additions, 1 deletion...stylesheets/extranet/_default/components/_pagination.sass
- app/assets/stylesheets/extranet/_default/layouts/_header.sass 12 additions, 29 deletions...assets/stylesheets/extranet/_default/layouts/_header.sass
- app/assets/stylesheets/extranet/_default/layouts/_nav.sass 24 additions, 0 deletionsapp/assets/stylesheets/extranet/_default/layouts/_nav.sass
- app/assets/stylesheets/extranet/_default/pages/_default.sass 12 additions, 11 deletionsapp/assets/stylesheets/extranet/_default/pages/_default.sass
- app/assets/stylesheets/extranet/_default/pages/_home.sass 19 additions, 10 deletionsapp/assets/stylesheets/extranet/_default/pages/_home.sass
- app/assets/stylesheets/extranet/_default/pages/_organization.sass 11 additions, 27 deletions...ts/stylesheets/extranet/_default/pages/_organization.sass
- app/assets/stylesheets/extranet/_default/pages/_person.sass 5 additions, 3 deletionsapp/assets/stylesheets/extranet/_default/pages/_person.sass
- app/controllers/extranet/organizations_controller.rb 8 additions, 2 deletionsapp/controllers/extranet/organizations_controller.rb
- app/controllers/users/omniauth_callbacks_controller.rb 2 additions, 2 deletionsapp/controllers/users/omniauth_callbacks_controller.rb
- app/models/ability.rb 2 additions, 0 deletionsapp/models/ability.rb
- app/models/communication/website/menu/item.rb 1 addition, 1 deletionapp/models/communication/website/menu/item.rb
- app/models/university/organization/facets.rb 13 additions, 0 deletionsapp/models/university/organization/facets.rb
- app/models/university/person/alumnus/import.rb 115 additions, 96 deletionsapp/models/university/person/alumnus/import.rb
- app/models/university/with_sso.rb 4 additions, 1 deletionapp/models/university/with_sso.rb
- app/models/user/with_omniauth.rb 10 additions, 6 deletionsapp/models/user/with_omniauth.rb
Loading
Please register or sign in to comment