From 5792d937a5c8979631b8008c9059b29b1ea048b1 Mon Sep 17 00:00:00 2001
From: Jaimyn Mayer <hello@jaimyn.dev>
Date: Wed, 17 Jan 2024 15:35:30 +1000
Subject: [PATCH] v3.6.0

---
 .github/workflows/build_docker.dev.yml     |  2 +-
 .github/workflows/build_docker.pr.yml      |  2 +-
 .github/workflows/build_docker.release.yml |  2 +-
 CHANGELOG.md                               | 18 ++++++++++++++++++
 README.md                                  |  4 ++++
 package.json                               |  2 +-
 src-frontend/package.json                  |  2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_docker.dev.yml b/.github/workflows/build_docker.dev.yml
index 43274ad2..13e45d59 100644
--- a/.github/workflows/build_docker.dev.yml
+++ b/.github/workflows/build_docker.dev.yml
@@ -1,4 +1,4 @@
-name: Build Docker Image (DEV Branch)
+name: Build Docker Image (On Dev Push)
 
 on:
   push:
diff --git a/.github/workflows/build_docker.pr.yml b/.github/workflows/build_docker.pr.yml
index 1ba3d379..489388b1 100644
--- a/.github/workflows/build_docker.pr.yml
+++ b/.github/workflows/build_docker.pr.yml
@@ -1,4 +1,4 @@
-name: Build Docker Image (DEV Branch)
+name: Build Docker Image (On PR)
 
 on:
   pull_request:
diff --git a/.github/workflows/build_docker.release.yml b/.github/workflows/build_docker.release.yml
index 1f11ae30..73225f54 100644
--- a/.github/workflows/build_docker.release.yml
+++ b/.github/workflows/build_docker.release.yml
@@ -1,4 +1,4 @@
-name: Build Docker Image (Prod Release)
+name: Build Docker Image (On Prod Release)
 
 on:
   push:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29f1845f..5a965016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.6.0] - 2024-01-17
+
+### Added
+
+- SMS logging
+- Send SMS notification to member feature
+
+### Changed
+
+- Some of the Django log_types options to be more brief/consistent
+- Some of the GHA workflows to be more consistent
+- The main readme to be more up to date/accurate
+
+### Fixed
+
+- #232 email sending bug (thanks @snoopen)
+- Email template rendering bug with footer (thanks @snoopen)
+
 ## [v3.5.0] - 2024-01-06
 
 ### Removed
diff --git a/README.md b/README.md
index 13c45403..7093754b 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,10 @@ See the [screenshots](screenshots) folder for more screenshots.
 # Developers Information
 
 ## Getting Started
+[![Build Docker Image (Prod)](https://github.com/membermatters/MemberMatters/actions/workflows/build_docker.yml/badge.svg?branch=main)](https://github.com/membermatters/MemberMatters/actions/workflows/build_docker.yml)
+
+[![Build Docker Image (Dev Branch)](https://github.com/membermatters/MemberMatters/actions/workflows/build_docker.dev.yml/badge.svg)](https://github.com/membermatters/MemberMatters/actions/workflows/build_docker.dev.yml)
+
 
 ### Pre-Commit Hooks
 
diff --git a/package.json b/package.json
index 1e7249ed..c3b93478 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "membermatters",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "devDependencies": {
     "eslint-webpack-plugin": "^3.1.1",
     "husky": "^6.0.0",
diff --git a/src-frontend/package.json b/src-frontend/package.json
index 71a450a2..6d0add38 100644
--- a/src-frontend/package.json
+++ b/src-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "The MemberMatters frontend",
   "productName": "MemberMatters",
   "author": "Jaimyn Mayer <github@jaimyn.dev>",