Merge branch 'main' into api
No related branches found
No related tags found
Showing
- Gemfile 3 additions, 1 deletionGemfile
- Gemfile.lock 35 additions, 33 deletionsGemfile.lock
- app/assets/config/manifest.js 1 addition, 0 deletionsapp/assets/config/manifest.js
- app/assets/examples/alumni-example.xlsx 0 additions, 0 deletionsapp/assets/examples/alumni-example.xlsx
- app/assets/images/communication/blocks/templates/agenda.jpg 0 additions, 0 deletionsapp/assets/images/communication/blocks/templates/agenda.jpg
- app/assets/images/communication/blocks/templates/agenda/grid.png 0 additions, 0 deletions...ets/images/communication/blocks/templates/agenda/grid.png
- app/assets/images/communication/blocks/templates/agenda/list.png 0 additions, 0 deletions...ets/images/communication/blocks/templates/agenda/list.png
- app/assets/images/communication/blocks/templates/organizations.jpg 0 additions, 0 deletions...s/images/communication/blocks/templates/organizations.jpg
- app/assets/images/communication/blocks/templates/organizations/grid.png 0 additions, 0 deletions...ges/communication/blocks/templates/organizations/grid.png
- app/assets/images/communication/blocks/templates/organizations/map.png 0 additions, 0 deletions...ages/communication/blocks/templates/organizations/map.png
- app/assets/images/communication/blocks/templates/persons.jpg 0 additions, 0 deletionsapp/assets/images/communication/blocks/templates/persons.jpg
- app/assets/images/communication/blocks/templates/video.jpg 0 additions, 0 deletionsapp/assets/images/communication/blocks/templates/video.jpg
- app/assets/stylesheets/admin/commons/content-editor.sass 1 addition, 1 deletionapp/assets/stylesheets/admin/commons/content-editor.sass
- app/assets/stylesheets/extranet/layout/_nav.sass 1 addition, 1 deletionapp/assets/stylesheets/extranet/layout/_nav.sass
- app/assets/stylesheets/extranet/pages/_devise.sass 1 addition, 1 deletionapp/assets/stylesheets/extranet/pages/_devise.sass
- app/controllers/admin/communication/websites_controller.rb 2 additions, 17 deletionsapp/controllers/admin/communication/websites_controller.rb
- app/controllers/admin/university/apps_controller.rb 6 additions, 0 deletionsapp/controllers/admin/university/apps_controller.rb
- app/controllers/api/osuny/application_controller.rb 2 additions, 3 deletionsapp/controllers/api/osuny/application_controller.rb
- app/controllers/api/osuny/communication/websites/posts_controller.rb 2 additions, 2 deletions...lers/api/osuny/communication/websites/posts_controller.rb
- app/controllers/api/osuny/server/websites_controller.rb 0 additions, 4 deletionsapp/controllers/api/osuny/server/websites_controller.rb
Loading
Please register or sign in to comment