Merge branch 'main' into server_locales
No related branches found
No related tags found
Showing
- app/controllers/admin/education/programs_controller.rb 2 additions, 1 deletionapp/controllers/admin/education/programs_controller.rb
- app/models/communication/website/agenda/event.rb 1 addition, 0 deletionsapp/models/communication/website/agenda/event.rb
- app/models/communication/website/agenda/event/with_cal.rb 35 additions, 0 deletionsapp/models/communication/website/agenda/event/with_cal.rb
- app/models/communication/website/agenda/event/with_time.rb 9 additions, 1 deletionapp/models/communication/website/agenda/event/with_time.rb
- app/models/education/program.rb 41 additions, 35 deletionsapp/models/education/program.rb
- app/models/research/hal/author.rb 2 additions, 1 deletionapp/models/research/hal/author.rb
- app/models/university/person/with_research.rb 1 addition, 1 deletionapp/models/university/person/with_research.rb
- app/views/admin/communication/websites/agenda/events/_dates.html.erb 1 addition, 1 deletion...dmin/communication/websites/agenda/events/_dates.html.erb
- app/views/admin/communication/websites/agenda/events/_dates_static.html.erb 5 additions, 5 deletions...mmunication/websites/agenda/events/_dates_static.html.erb
- app/views/admin/education/programs/_form.html.erb 12 additions, 1 deletionapp/views/admin/education/programs/_form.html.erb
- app/views/admin/education/programs/show.html.erb 3 additions, 0 deletionsapp/views/admin/education/programs/show.html.erb
- app/views/admin/education/programs/static.html.erb 3 additions, 0 deletionsapp/views/admin/education/programs/static.html.erb
- config/locales/education/en.yml 4 additions, 1 deletionconfig/locales/education/en.yml
- config/locales/education/fr.yml 4 additions, 1 deletionconfig/locales/education/fr.yml
- db/migrate/20240208131753_add_add_to_calendar_urls_to_communication_website_agenda_events.rb 7 additions, 0 deletions...o_calendar_urls_to_communication_website_agenda_events.rb
- db/migrate/20240209135241_add_pricing_fields_to_education_programs.rb 7 additions, 0 deletions...0240209135241_add_pricing_fields_to_education_programs.rb
- db/schema.rb 5 additions, 1 deletiondb/schema.rb
Loading
Please register or sign in to comment