Merge pull request #186 from Ilhasoft/update/1.2.110

Update/1.2.110
Ilhasoft · Apr 17, 2024 · 3838303 · 3838303
2 parents 4dd8960 + 6fc9f48
commit 3838303
Show file tree

Hide file tree

Showing 23 changed files with 1,543 additions and 977 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="description" content="">
+    <meta name="keywords" content="">
+    <title>U-Report - Not Found.</title>
+    <style>
+      body {
+        background-color: #FFFFFF;
+      }
+
+      .logo {
+        margin: 0 auto;
+        margin-top: 190px;
+        width: 100%;
+        text-align: center;
+
+      }
+
+      .message {
+        margin-top: 18px;
+        color: #333;
+        font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif;
+        font-size: 14px;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="logo">
+      <img src="/logo.png" alt="" style="max-width: 300px;" />
+    </div>
+    <div class="message">
+      Sorry, that page wasn't found.
+      We've been notified of the error.
+      <br>
+    </div>
+  </body>
+</html>
diff --git a/config/error.html b/config/error.html
@@ -1,5 +1,9 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
+    <meta charset="utf-8">
+    <meta name="description" content="">
+    <meta name="keywords" content="">
 
     <title>UReport: One moment</title>
     <style>
@@ -12,7 +16,6 @@
             margin-top:190px;            
             width:100%;
             text-align:center;
-
         }
 
         .message {
@@ -27,7 +30,7 @@
 <body>
 
 <div class="logo">
-<img src="/logo.png"/>
+    <img src="/logo.png" alt="" style="max-width: 300px;"/>
 </div>
 
 <div class="message">

diff --git a/config/logo.png b/config/logo.png