Merge pull request #6 from magenta-aps/master

2.1.0 - release

NEWS

@@ -1,3 +1,15 @@
+* Version 2.1.0, March 15. 2019
+
+New in this version:
+    - CPR rule is no longer located on the scannerjob model.
+    - Matches now have Windows friendly paths.
+    - Clicking a path in a filescan report will automatically copy it to the clipboard.
+    - Ordinary users can create domains again.
+    - Better handling of Libreoffice processes.
+    - Dead links found during webscan can be viewed properly in the report again.
+    - Interface for validating domains works again.
+    - A number of bug fixes: #27664, #27407 and #27037
+
 * Version 2.0.0, January 17. 2019
 
 New in this version:

VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

django-os2webscanner/os2webscanner/admin.py

@@ -15,37 +15,34 @@
 # source municipalities ( http://www.os2web.dk/ )
 """Admin form configuration."""
 
+from django.conf import settings
 from django.contrib import admin
-from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin
-
-from django.utils.translation import ugettext, ugettext_lazy as _
-
-from django.conf import settings
+from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 
 from .models.authentication_model import Authentication
+from .models.conversionqueueitem_model import ConversionQueueItem
+from .models.domains.exchangedomain_model import ExchangeDomain
+from .models.domains.filedomain_model import FileDomain
+from .models.group_model import Group
+from .models.match_model import Match
 from .models.organization_model import Organization
-from .models.userprofile_model import UserProfile
-from .models.webdomain_model import WebDomain
-from .models.filedomain_model import FileDomain
-from .models.exchangedomain_model import ExchangeDomain
+from .models.referrerurl_model import ReferrerUrl
+from .models.regexpattern_model import RegexPattern
 from .models.regexrule_model import RegexRule
-from .models.scanner_model import Scanner
-from .models.match_model import Match
+from .models.scans.scan_model import Scan
+from .models.scannerjobs.scanner_model import Scanner
+from .models.statistic_model import Statistic
 from .models.url_model import Url
-from .models.scan_model import Scan
-from .models.conversionqueueitem_model import ConversionQueueItem
-from .models.referrerurl_model import ReferrerUrl
 from .models.urllastmodified_model import UrlLastModified
-from .models.group_model import Group
-from .models.md5sum_model import Md5Sum
-from .models.statistic_model import Statistic
-from .models.regexpattern_model import RegexPattern
+from .models.userprofile_model import UserProfile
+from .models.domains.webdomain_model import WebDomain
 
 ar = admin.site.register
 classes = [Authentication, Organization, WebDomain, FileDomain, ExchangeDomain,
            RegexRule, Scanner, Scan, Match, Url, ConversionQueueItem, ReferrerUrl,
-           UrlLastModified, Group, Md5Sum, Statistic, RegexPattern]
+           UrlLastModified, Group, Statistic, RegexPattern]
 list(map(ar, classes))