diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7af5ad6d..173c2185b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,11 @@ on: [push, pull_request] jobs: test: name: Test + strategy: + matrix: + python-version: ["3.10.x", "3.11.x"] + django-version: ["4.2.x", "5.0.x"] env: - python-version: "3.10.x" redis-version: "6.2" pg-version: "15" runs-on: ubuntu-22.04 @@ -28,7 +31,7 @@ jobs: - name: Install Python uses: actions/setup-python@v1 with: - python-version: ${{ env.python-version }} + python-version: ${{ matrix.python-version }} - name: Install Poetry uses: snok/install-poetry@v1 @@ -38,6 +41,7 @@ jobs: - name: Initialize environment run: | poetry install --no-root + poetry add django==${{ matrix.django-version }} sudo npm install -g coffee-script less ln -s ${{ github.workspace }}/ureport/settings.py.postgres ${{ github.workspace }}/ureport/settings.py diff --git a/CHANGELOG.md b/CHANGELOG.md index e3a576fa5..27a84329f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +v1.2.110 (2024-04-16) +------------------------- + * Merge pull request #1201 from rapidpro/fix-drf-base-template + +v1.2.108 (2024-04-11) +------------------------- + * Merge pull request #1200 from rapidpro/message-storage-sessions + +v1.2.106 (2024-04-11) +------------------------- + * Merge pull request #1199 from rapidpro/update-js-libraries + +v1.2.104 (2024-04-11) +------------------------- + * Merge pull request #1198 from rapidpro/error-page + +v1.2.102 (2024-04-09) +------------------------- + * Update FB JS SDK versions + * Merge pull request #1171 from rapidpro/prep-django5 + * Update DRF to 3.15.0 + * Use datetime timezone aliased as tzone + * Prep and start testing on django 5.0 + * Merge pull request #1196 from rapidpro/update-deps + * Update django + * Update to latest black, ruff, isort and djlint + v1.2.101 (2024-03-05) ------------------------- * Merge pull request #1193 from rapidpro/polls-cyan diff --git a/config/404.html b/config/404.html new file mode 100644 index 000000000..0fcd18523 --- /dev/null +++ b/config/404.html @@ -0,0 +1,40 @@ + + + + + + + U-Report - Not Found. + + + + +
+ Sorry, that page wasn't found. + We've been notified of the error. +
+
+ + diff --git a/config/error.html b/config/error.html index 2b3f4c701..28209c686 100644 --- a/config/error.html +++ b/config/error.html @@ -1,5 +1,9 @@ - + + + + + UReport: One moment