Skip to content
This repository has been archived by the owner on Aug 28, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/1.15.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
maurizi committed Feb 15, 2022
2 parents 2ccc8b5 + 6427de5 commit 7e6d957
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

<!--When making a new release, remember to update the magic links at the bottom.-->
## [1.15.1] - 2022-02-15
### Fixed
- Updated 'urllib3' and 'django_amazon_ses' to fix sending email

## [1.15.0] - 2022-02-09
### Changed
- Replaced form to contact ICLEI with a prompt to email Azavea
Expand Down Expand Up @@ -196,7 +200,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Initial release

[Unreleased]: https://github.com/azavea/temperate/compare/1.15.0...HEAD
[Unreleased]: https://github.com/azavea/temperate/compare/1.15.1...HEAD
[1.15.1]: https://github.com/azavea/temperate/compare/1.15.0...1.15.1
[1.15.0]: https://github.com/azavea/temperate/compare/1.14.1...1.15.0
[1.14.1]: https://github.com/azavea/temperate/compare/1.14.0...1.14.1
[1.14.0]: https://github.com/azavea/temperate/compare/1.13.0...1.14.0
Expand Down
2 changes: 1 addition & 1 deletion src/django/planit/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
# https://github.com/EliotBerriot/django-dbes/issues/4
# EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
else:
EMAIL_BACKEND = 'django_amazon_ses.backends.boto.EmailBackend'
EMAIL_BACKEND = 'django_amazon_ses.EmailBackend'

DEFAULT_FROM_EMAIL = '[email protected]'
SUPPORT_EMAIL = '[email protected]'
Expand Down
4 changes: 2 additions & 2 deletions src/django/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ django-cors-headers==2.2.0
django-composite-foreignkey==1.1.0
djangorestframework==3.7.7
djangorestframework-gis==0.12.0
django-amazon-ses==0.3.0
django-amazon-ses==3.0.2
django-annoying==0.10.4
django-bitfield==1.9.3
django-dbes==0.1.0
Expand All @@ -21,6 +21,6 @@ flake8==3.5.0
ipdb==0.11
ipython==6.2.1
python-omgeo==5.0.0
requests>=2.21,<2.21.99
requests>=2.27,<2.27.99
rollbar>=0.13,<0.13.99
us==1.0.0

0 comments on commit 7e6d957

Please sign in to comment.