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

591d97fc

Commit 591d97fc authored 3 years ago by Arnaud Levy

Downloads
- Plain Diff

Merge branch 'master' of github.com:noesya/osuny

parents 53b5b8cb ad7b02a8

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/admin/pages/communication/website/pages.js 6 additions, 15 deletions

...ts/javascripts/admin/pages/communication/website/pages.js
app/assets/stylesheets/admin/treeview.sass 24 additions, 12 deletions

app/assets/stylesheets/admin/treeview.sass
app/controllers/admin/communication/website/pages_controller.rb 5 additions, 2 deletions

...ntrollers/admin/communication/website/pages_controller.rb
app/inputs/trix_editor_input.rb 0 additions, 42 deletions

app/inputs/trix_editor_input.rb
app/models/research/journal/article.rb 1 addition, 1 deletion

app/models/research/journal/article.rb
app/views/admin/communication/website/pages/_treebranch.html.erb 22 additions, 0 deletions

...ws/admin/communication/website/pages/_treebranch.html.erb
app/views/admin/communication/website/pages/children.js.erb 5 additions, 1 deletion

app/views/admin/communication/website/pages/children.js.erb
app/views/admin/communication/website/pages/index.html.erb 1 addition, 17 deletions

app/views/admin/communication/website/pages/index.html.erb
db/schema.rb 1 addition, 1 deletion

db/schema.rb

with 65 additions and 91 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