Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

Admin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7ae7f96f

Unverified Commit 7ae7f96f authored 1 year ago by Arnaud Levy Committed by GitHub 1 year ago

Downloads
- Plain Diff

Merge branch 'main' into agenda-no-event

parents 260818a3 6dd11094

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/admin/commons/photo-import.sass 10 additions, 0 deletions

app/assets/stylesheets/admin/commons/photo-import.sass
app/controllers/server/websites_controller.rb 1 addition, 0 deletions

app/controllers/server/websites_controller.rb
app/models/communication/website.rb 6 additions, 3 deletions

app/models/communication/website.rb
app/views/admin/application/_filters.html.erb 1 addition, 1 deletion

app/views/admin/application/_filters.html.erb
app/views/admin/communication/photo_imports/_selector.html.erb 35 additions, 31 deletions

...iews/admin/communication/photo_imports/_selector.html.erb
app/views/admin/research/journals/papers/static.html.erb 1 addition, 1 deletion

app/views/admin/research/journals/papers/static.html.erb

with 54 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment