Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

soitool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

d6104d55

Commit d6104d55 authored 5 years ago by Anders H. Rebner

Downloads
- Plain Diff

Merge branch 'master' into 'kodebok-redigerings-widget'

# Conflicts:
#   soitool/main_window.py

parents 48494127 5102cbe9

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

soitool/codebook_model_view.py 9 additions, 7 deletions

soitool/codebook_model_view.py
soitool/codebook_to_pdf.py 11 additions, 7 deletions

soitool/codebook_to_pdf.py
soitool/database.py 16 additions, 12 deletions

soitool/database.py
soitool/main_window.py 10 additions, 11 deletions

soitool/main_window.py
soitool/setup_settings.py 210 additions, 55 deletions

soitool/setup_settings.py
soitool/soi_workspace_widget.py 11 additions, 3 deletions

soitool/soi_workspace_widget.py
test/test_codebook_to_pdf.py 11 additions, 2 deletions

test/test_codebook_to_pdf.py
test/test_database.py 9 additions, 5 deletions

test/test_database.py
test/test_main_window.py 11 additions, 2 deletions

test/test_main_window.py

with 298 additions and 104 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