Merge pull request #878 from rdmorganiser/dev-2.2.0

RDMO 2.2.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,7 @@ A clear and concise description of what you expected to happen.
 
 ### Context / Kontext
 
-Please state your operating system, the RDMO version, and (if applicable) the browser the error occured in.
+Please state your operating system, the RDMO version, and (if applicable) the browser the error occurred in.
 
 ### References / Verweise
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,24 @@
-<!-- These comments are hidden when you submit the pull request, so you do not need to remove them. -->
+<!--- These comments are hidden when you submit the pull request, --->
+<!--- so you do not need to remove them. --->
 
-<!--- Provide a general summary of your changes in the Title above --->
+<!--- Before opening a pull request, go over all the following points: --->
+<!--- * I have read the contributor guide (CONTRIBUTING.md) --->
+<!--- * My code follows the code style of this project --->
+<!--- * I added tests to cover my changes --->
+<!--- * If needed, I updated the documentation --->
+<!--- * If needed, I added translations if they are needed --->
+<!--- * If needed, I added migration files and checked for potential conflicts --->
+
+<!--- This project only accepts pull requests related to open issues. --->
+<!--- If suggesting a new feature or change, please discuss it in an issue first. --->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce. --->
+
+<!--- Please provide a general summary of your changes in the title of the pull request --->
 
 ## Description
 <!--- Describe your changes in detail --->
 
-<!--- This project only accepts pull requests related to open issues --->
-<!--- If suggesting a new feature or change, please discuss it in an issue first --->
-<!--- If fixing a bug, there should be an issue describing it with steps to reproduce --->
-<!--- Please link to the issue here: --->
+<!--- Please link to a related issue here --->
 Related issue: #ISSUE_NUMBER
 
 ## Motivation and Context
@@ -21,27 +31,6 @@ Related issue: #ISSUE_NUMBER
 
 ## Screenshots (if appropriate)
 
-## Types of Changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-- [ ] Code style update (formatting, renaming)
-- [ ] Refactoring (no functional changes, no api changes)
-- [ ] Build related changes
-- [ ] Documentation content changes
-- [ ] Other (please describe):
-
-## Checklist
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. --->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --->
-- [ ] I have read the [contributor guide](https://github.com/rdmorganiser/rdmo/blob/main/CONTRIBUTING.md).
-- [ ] My code follows the code style of this project.
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
-- [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
-
-<!--- This pull request template is adapted from:
-<!--- "open-source-templates", https://github.com/TalAter/open-source-templates (MIT License). --->
-<!--- "amazing-github-template", https://github.com/dec0dOS/amazing-github-template (MIT License). --->
+<!--- This pull request template is adapted from: --->
+<!--- https://github.com/TalAter/open-source-templates (MIT License). --->
+<!--- https://github.com/dec0dOS/amazing-github-template (MIT License). --->

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
   directory: /
   schedule:
     interval: monthly
+  versioning-strategy: increase-if-necessary
   open-pull-requests-limit: 10
   target-branch: dependency-updates
   labels:
@@ -12,11 +13,12 @@ updates:
   - type:maintenance
   ignore:
   - dependency-name: django-mptt # pinned, 0.15 requires Python >= 3.9
+  - dependency-name: django
+    update-types: [ "version-update:semver-major"] # ignore major for django
   groups:
     # create a single pull request containing all updates for the optional dependencies
     optional:
       patterns:
-      - coveralls
       - django-allauth
       - django-auth-ldap
       - gunicorn
@@ -33,7 +35,6 @@ updates:
   directory: /
   schedule:
     interval: monthly
-  open-pull-requests-limit: 10
   target-branch: dependency-updates
   labels:
   - dependencies
@@ -58,6 +59,8 @@ updates:
   - dependency-name: react-bootstrap # rdmo still uses bootstrap 3, which is not supported by react-bootstrap > 0.33.1
   - dependency-name: "*"
     update-types: ["version-update:semver-patch"] # ignore patch versions for all JavaScript dependencies
+  - dependency-name: react-redux
+    update-types: ["version-update:semver-major"] # ignore major for react-redux
   groups:
     react:
       patterns: