diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b27feec..e3a576fa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +v1.2.101 (2024-03-05) +------------------------- + * Merge pull request #1193 from rapidpro/polls-cyan + * Use cyan, black and white colors for new brand on polls page + * Merge pull request #1191 from rapidpro/dependabot/pip/jinja2-3.1.3 + * Merge pull request #1192 from rapidpro/dependabot/pip/django-4.2.10 + * Bump django from 4.2.7 to 4.2.10 + * Bump jinja2 from 3.1.2 to 3.1.3 + +v1.2.100 (2024-02-28) +------------------------- + * Merge pull request #1190 from rapidpro/fix-drc-logo + +v1.2.99 (2024-02-28) +------------------------- + * Merge pull request #1189 from rapidpro/drc-logo + * Quick workaround custom DRC logo + * Merge pull request #1188 from rapidpro/drc-logo + * Quick workaround custom DRC logo + +v1.2.98 (2024-02-26) +------------------------- + * Merge pull request #1187 from rapidpro/logo-lang + +v1.2.96 (2024-02-08) +------------------------- + * Fix tab title + +v1.2.95 (2024-02-07) +------------------------- + * Merge pull request #1186 from rapidpro/links-updates + * Update VOY links + v1.2.94 (2024-02-05) ------------------------- * Merge pull request #1185 from rapidpro/fix-org-name-spacing diff --git a/poetry.lock b/poetry.lock index f696672e8..a977d55d0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -498,13 +498,13 @@ files = [ [[package]] name = "django" -version = "4.2.7" +version = "4.2.10" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." optional = false python-versions = ">=3.8" files = [ - {file = "Django-4.2.7-py3-none-any.whl", hash = "sha256:e1d37c51ad26186de355cbcec16613ebdabfa9689bbade9c538835205a8abbe9"}, - {file = "Django-4.2.7.tar.gz", hash = "sha256:8e0f1c2c2786b5c0e39fe1afce24c926040fad47c8ea8ad30aaf1188df29fc41"}, + {file = "Django-4.2.10-py3-none-any.whl", hash = "sha256:a2d4c4d4ea0b6f0895acde632071aff6400bfc331228fc978b05452a0ff3e9f1"}, + {file = "Django-4.2.10.tar.gz", hash = "sha256:b1260ed381b10a11753c73444408e19869f3241fc45c985cd55a30177c789d13"}, ] [package.dependencies] @@ -843,13 +843,13 @@ files = [ [[package]] name = "jinja2" -version = "3.1.2" +version = "3.1.3" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" files = [ - {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, - {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, + {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, + {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, ] [package.dependencies] @@ -2018,4 +2018,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "c4bc931be2a5daafa48a5b8d45b6c8a8a59361e6a38384bed18f8695dd9cbafd" \ No newline at end of file +content-hash = "21b9217fae49196396e9cae04bd133e1cddb69b672c1b17f338f44da3ee9b4c5" diff --git a/pyproject.toml b/pyproject.toml index 560e6ab3f..9f1288685 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,13 @@ [tool.poetry] name = "ureport" -version = "1.2.94" +version = "1.2.101" description = "U-Report dashboard built on data collected by RapidPro" authors = ["Nyaruka Ltd "] readme = "README.md" [tool.poetry.dependencies] python = "^3.10" -Django = "^4.2.7" +Django = "^4.2.10" smartmin = "^4.2.5" rapidpro-dash = "^1.14.3" colorama = "^0.4.3" diff --git a/static/img/logos/UNICEF/UNICEF_logo_footer_SL.png b/static/img/logos/UNICEF/UNICEF_logo_footer_SL.png new file mode 100644 index 000000000..97d9e45e3 Binary files /dev/null and b/static/img/logos/UNICEF/UNICEF_logo_footer_SL.png differ diff --git a/static/img/logos/UREPORT/U-Report_LOGO_DRC.png b/static/img/logos/UREPORT/U-Report_LOGO_DRC.png new file mode 100644 index 000000000..ee6e85365 Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_LOGO_DRC.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo.png b/static/img/logos/UREPORT/U-Report_Logo.png deleted file mode 100644 index f8fec1e76..000000000 Binary files a/static/img/logos/UREPORT/U-Report_Logo.png and /dev/null differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_AR.png b/static/img/logos/UREPORT/U-Report_Logo_AR.png new file mode 100644 index 000000000..fc1d671de Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_AR.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_EN.png b/static/img/logos/UREPORT/U-Report_Logo_EN.png new file mode 100644 index 000000000..0f17de030 Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_EN.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_RU.png b/static/img/logos/UREPORT/U-Report_Logo_RU.png new file mode 100644 index 000000000..1b9214771 Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_RU.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert.png b/static/img/logos/UREPORT/U-Report_Logo_invert.png deleted file mode 100644 index 439cb4804..000000000 Binary files a/static/img/logos/UREPORT/U-Report_Logo_invert.png and /dev/null differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_AR.png b/static/img/logos/UREPORT/U-Report_Logo_invert_AR.png new file mode 100644 index 000000000..ec9c4c480 Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_invert_AR.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_EN.png b/static/img/logos/UREPORT/U-Report_Logo_invert_EN.png new file mode 100644 index 000000000..3fb6bc097 Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_invert_EN.png differ diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_RU.png b/static/img/logos/UREPORT/U-Report_Logo_invert_RU.png new file mode 100644 index 000000000..924b6202f Binary files /dev/null and b/static/img/logos/UREPORT/U-Report_Logo_invert_RU.png differ diff --git a/templates/base_admin_dashboard.html b/templates/base_admin_dashboard.html index b2d9969d9..33cc72240 100644 --- a/templates/base_admin_dashboard.html +++ b/templates/base_admin_dashboard.html @@ -89,7 +89,13 @@