Merge branch 'master' into markdown

# Conflicts:
#	RIGS/templates/RIGS/event_detail.html
#	RIGS/test_unit.py
#	requirements.txt
This commit is contained in:
2020-02-09 21:07:12 +00:00
124 changed files with 4009 additions and 924 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

@@ -65,6 +65,15 @@ textarea {
overflow: hidden;
}
.dont-break-out {
overflow-wrap: break-word;
word-wrap: break-word;
-webkit-hyphens: auto;
-ms-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}
.modal-dialog {
z-index: inherit; // bug fix introduced in 52682ce
}