Merge branch 'main' into feature/previews
No related branches found
No related tags found
Showing
- Gemfile 2 additions, 0 deletionsGemfile
- Gemfile.lock 23 additions, 0 deletionsGemfile.lock
- app/assets/javascripts/extranet.js 1 addition, 0 deletionsapp/assets/javascripts/extranet.js
- app/assets/stylesheets/extranet.sass 1 addition, 0 deletionsapp/assets/stylesheets/extranet.sass
- app/assets/stylesheets/extranet/layout/_leaflet.sass 2 additions, 0 deletionsapp/assets/stylesheets/extranet/layout/_leaflet.sass
- app/assets/stylesheets/extranet/layout/_typography.sass 1 addition, 8 deletionsapp/assets/stylesheets/extranet/layout/_typography.sass
- app/controllers/admin/university/organizations_controller.rb 1 addition, 1 deletionapp/controllers/admin/university/organizations_controller.rb
- app/models/concerns/with_geolocation.rb 22 additions, 0 deletionsapp/models/concerns/with_geolocation.rb
- app/models/university/organization.rb 28 additions, 26 deletionsapp/models/university/organization.rb
- app/views/admin/university/organizations/_form.html.erb 7 additions, 5 deletionsapp/views/admin/university/organizations/_form.html.erb
- app/views/admin/university/organizations/show.html.erb 31 additions, 11 deletionsapp/views/admin/university/organizations/show.html.erb
- app/views/admin/university/organizations/static.html.erb 2 additions, 0 deletionsapp/views/admin/university/organizations/static.html.erb
- app/views/extranet/contacts/organizations/show.html.erb 16 additions, 0 deletionsapp/views/extranet/contacts/organizations/show.html.erb
- config/initializers/leaflet.rb 3 additions, 0 deletionsconfig/initializers/leaflet.rb
- config/locales/university/en.yml 13 additions, 2 deletionsconfig/locales/university/en.yml
- config/locales/university/fr.yml 12 additions, 1 deletionconfig/locales/university/fr.yml
- db/migrate/20230308101244_add_fields_to_organizations.rb 6 additions, 0 deletionsdb/migrate/20230308101244_add_fields_to_organizations.rb
- db/schema.rb 3 additions, 1 deletiondb/schema.rb
- test/fixtures/university/organizations.yml 28 additions, 26 deletionstest/fixtures/university/organizations.yml
- test/models/university/organization_test.rb 28 additions, 26 deletionstest/models/university/organization_test.rb
Loading
Please register or sign in to comment