af8e4b6ca7
Merge pull request 'add healthcheck to db container' ( #34 ) from healthcheck into main
...
Reviewed-on: #34
2025-10-04 16:57:11 +10:00
b881f9162f
add healthcheck to db container
2025-10-04 16:54:54 +10:00
9dd94c033c
Merge pull request 'finally fix inactive newsletters' ( #32 ) from fixes into main
...
Reviewed-on: #32
2025-04-26 17:41:54 +10:00
14751d3ff0
finally fix inactive newsletters
2025-04-26 17:41:10 +10:00
a08f818a5f
Merge pull request 'fixes' ( #31 ) from fixes into main
...
Reviewed-on: #31
2025-04-26 17:35:54 +10:00
e6a9d51160
Merge branch 'main' into fixes
2025-04-26 17:33:32 +10:00
c8de9671d7
update deps and fix inactive newsletters being listed
2025-04-26 17:32:35 +10:00
91d5bd3734
Merge pull request 'Fix multiple issues' ( #29 ) from fixes into main
...
Reviewed-on: #29
2025-04-26 16:56:33 +10:00
be9a4d64ae
Fix multiple issues
...
* Stop referring to everything in the admin screen as a "blog" when taking actions
* create honeypot for bots signing up for email
* exclude "inactive" newsletters not just "unapproved"
* only announce events and CFPs that are approved
Fixes #22
Fixes #23
Fixes #26
2025-04-26 16:49:07 +10:00
01c50469a1
Merge pull request 'fix debug env' ( #28 ) from fixes into main
...
Reviewed-on: #28
2025-04-22 20:45:29 +10:00
58ec795b10
fix debug env
2025-04-22 20:44:51 +10:00
20c4d35542
Merge pull request 'bug fixes' ( #27 ) from fixes into main
...
Reviewed-on: #27
2025-04-22 17:41:25 +10:00
c214c993ed
bug fixes
...
- fix newsletters having a null pubdate
- fix unsubscribe link not working
- adjust worker and thread counts in docker compose
2025-04-22 17:39:12 +10:00
831a02ddad
Merge pull request 'fixes' ( #24 ) from fixes into main
...
Reviewed-on: #24
2025-04-14 12:14:26 +10:00
4502276d04
fix typo
2025-04-14 12:11:52 +10:00
528210f122
fix typos and env errors
2025-04-14 12:09:23 +10:00
812fc0f2a4
Merge pull request 'fix blog announcements and update tests' ( #21 ) from fixbyline into main
...
Reviewed-on: #21
2025-02-03 16:32:12 +11:00
8dc69f2a9e
fix blog announcements and update tests
...
Blog announcements were using the string "None" as the author, now they should not.
Updated tests accordingly.
Fixed email test being captured by bot trap.
2025-02-03 16:26:06 +11:00
cda4b61b4b
Merge pull request 'Reference parent conference in CFP section of weekly email' ( #20 ) from admin into main
...
Reviewed-on: #20
2024-11-09 10:02:07 +11:00
56094b9e7e
Merge branch 'main' into admin
2024-11-09 10:01:40 +11:00
507d6d3508
close p tag properly
2024-11-09 09:59:57 +11:00
5ce0a679fb
Add event detail to call for papers in weekly email
...
fixes #18
2024-11-09 09:58:40 +11:00
e814c9f981
Merge pull request 'add search in admin models' ( #19 ) from admin into main
...
Reviewed-on: #19
2024-11-09 09:52:56 +11:00
da58002f2f
clean up readme
2024-11-09 09:51:49 +11:00
60451f565a
Merge branch 'main' into admin
2024-11-09 09:50:18 +11:00
2e0bcb1c01
Merge branch 'main' of git.suboptimal.solutions:hugh/ausglamr
2024-11-09 09:49:53 +11:00
16561eba6f
add search to admin screens
2024-11-09 09:44:36 +11:00
9a355ff2a0
Merge pull request 'Bump django from 4.2.11 to 4.2.14' ( #16 ) from dependabot/pip/django-4.2.14 into main
...
Reviewed-on: #16
2024-07-30 20:28:34 +10:00
1864761a47
Merge branch 'main' into dependabot/pip/django-4.2.14
2024-07-30 20:28:03 +10:00
cd42612596
Merge pull request 'update docs and glamr-dev' ( #17 ) from docs into main
...
Reviewed-on: #17
2024-07-30 20:27:15 +10:00
7ce005d2e0
update docs and glamr-dev
...
- improve README: adds instructions for restoring backups, and setting crontab
- remove deprecated "version" from docker-compose
- add nginx example conf
- add .env to .gitignore (!)
2024-07-30 20:23:22 +10:00
c8fc3b4c45
Merge pull request #17 from hughrun/hughrun-patch-2
...
Update README.md to point to new repo
2024-07-29 20:08:49 +10:00
e8bebca7b4
Update README.md to point to new repo
2024-07-29 20:08:30 +10:00
dependabot[bot]
d57c44cc85
Bump django from 4.2.11 to 4.2.14
...
Bumps [django](https://github.com/django/django ) from 4.2.11 to 4.2.14.
- [Commits](https://github.com/django/django/compare/4.2.11...4.2.14 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-10 22:08:59 +00:00
d70c1f0182
Merge pull request #15 from hughrun/fix-summaries
...
fix faulty description appending code
2024-06-28 18:29:12 +10:00
fd773817eb
fix faulty description appending code
2024-06-28 18:28:26 +10:00
75de2f1c2c
Merge pull request #14 from hughrun/fix-summaries
...
Fix summaries
2024-06-24 12:26:24 +10:00
88d56e5e04
formatting
2024-06-24 12:23:01 +10:00
365b7e7d78
don't use entire post if it is in the "summary".
2024-06-24 12:22:35 +10:00
e2ab82c2de
Merge pull request #13 from hughrun/hughrun-patch-1
...
Update requirements.txt
2024-06-17 16:29:02 +10:00
ab6f26c046
Update requirements.txt
...
requests 2.32.0 was yanked.
2024-06-17 16:28:44 +10:00
929b9fb5ef
Merge pull request #12 from hughrun/editions
...
check newsletter description properly
2024-06-17 16:22:24 +10:00
9932e57b93
Merge pull request #10 from hughrun/dependabot/pip/requests-2.32.0
...
Bump requests from 2.31.0 to 2.32.0
2024-06-17 16:22:04 +10:00
496edb75b0
check newsletter description properly
...
also sends a blank string instead of None if nothing else matches
fixes #11
2024-06-17 15:58:32 +10:00
dependabot[bot]
5bcc9f6ce5
---
...
updated-dependencies:
- dependency-name: requests
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-21 07:16:03 +00:00
ead268a47c
Merge pull request #9 from hughrun/dependabot/pip/gunicorn-22.0.0
...
Bump gunicorn from 21.2.0 to 22.0.0
2024-05-04 13:56:21 +10:00
dependabot[bot]
2e8c28ca02
Bump gunicorn from 21.2.0 to 22.0.0
...
Bumps [gunicorn](https://github.com/benoitc/gunicorn ) from 21.2.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases )
- [Commits](https://github.com/benoitc/gunicorn/compare/21.2.0...22.0.0 )
---
updated-dependencies:
- dependency-name: gunicorn
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-17 02:42:38 +00:00
e4d2e4f730
Merge pull request #8 from hughrun/fixes
...
add analytics code
2024-03-31 09:39:12 +11:00
b54aa96eff
add analytics code
2024-03-31 09:38:19 +11:00
57082c92c9
Merge pull request #7 from hughrun/fixes
...
Various fixes
2024-03-23 16:26:43 +11:00
