Skip to content

Commit

Permalink
Merge pull request #238 from membermatters/feature/v3.6.0
Browse files Browse the repository at this point in the history
v3.6.0
  • Loading branch information
jabelone authored Jan 17, 2024
2 parents d8f519f + 5792d93 commit 109beb0
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_docker.dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker Image (DEV Branch)
name: Build Docker Image (On Dev Push)

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docker.pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker Image (DEV Branch)
name: Build Docker Image (On PR)

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docker.release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker Image (Prod Release)
name: Build Docker Image (On Prod Release)

on:
push:
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.5.0",
"version": "3.6.0",
"description": "The MemberMatters frontend",
"productName": "MemberMatters",
"author": "Jaimyn Mayer <[email protected]>",
Expand Down

0 comments on commit 109beb0

Please sign in to comment.