Skip to content

v3.7.0 #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 110 commits into from
Aug 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
1c1bcee
added GHA comment about PR on wrong branch
jabelone Apr 20, 2024
b3941ad
fix unhandled exception when logging access for non existent user
jabelone Apr 20, 2024
44737f0
updated logging with per app level configuration
jabelone Apr 23, 2024
2f54bf1
sync device if exempt_signin changes
jabelone Apr 23, 2024
b349f46
Increase Docker Python version to 3.12
jabelone May 23, 2024
1e1f2f7
Increase Docker Node version to 22
jabelone May 23, 2024
dc30244
Upgrade archaic Stripe npm version
jabelone May 23, 2024
4c52514
Add signal to automatically sync access changes in realtime
jabelone May 23, 2024
ab4419c
Added MemberbucksProduct and MemberbucksProductPurchaseLog
jabelone May 23, 2024
6bcc8fb
Updated AccessControlledDevice with supports credit/debit/purchase flags
jabelone May 23, 2024
db331e8
Merge pull request #261 from membermatters/fixes-and-tweaks
jabelone May 23, 2024
a6984bd
Refactored credit websocket API to combined credit/debit websocket api
jabelone May 23, 2024
519b435
fixed devices list not showing door bump & manage button on mobile
jabelone May 24, 2024
1c9a07c
highlight offline devices with warning colour and disable bump
jabelone May 24, 2024
39faa77
fix bugs on device modal with weird next logic
jabelone May 24, 2024
b0b42c0
fixed typo in model
jabelone May 24, 2024
586e8d8
fixed door syncing signals
jabelone May 24, 2024
3232c81
added memberbucks devices to devices page
jabelone May 24, 2024
ae92046
added total purchases to memberbucks device list
jabelone May 24, 2024
07f4f1e
added memberbucks product log with external_id to credit/debit api
jabelone May 24, 2024
edcc707
show maintenance lockout on access permissions page
jabelone May 24, 2024
83a4a59
fixed memberbucks spacing
jabelone May 24, 2024
940eebe
removed old confusing signals
jabelone May 26, 2024
4153d8b
fixed weird device auth related bug
jabelone May 26, 2024
48fd09a
admin access page list shows warning about disabled state/locked out
jabelone May 26, 2024
d9fd92d
added prometheus metrics to all db models
jabelone May 28, 2024
8c8c33c
Merge pull request #262 from membermatters/fixes-and-tweaks
jabelone May 28, 2024
98874e6
update gha
jabelone May 28, 2024
12e9fac
escaped backticks in gha comment
jabelone May 28, 2024
c42ea8a
update gha comment
jabelone May 28, 2024
10ba19e
added access device metrics
jabelone May 28, 2024
feb30cc
fixup metrics import
jabelone May 28, 2024
70aadbd
added name to door metrics
jabelone May 28, 2024
cef1af2
fixed door locked_out logging
jabelone May 28, 2024
a1cd835
fix bug with device uptime reporting endpoint
jabelone May 28, 2024
dcc17b3
Add Vikunja teams configuration
jabelone May 30, 2024
bcc191e
made vikunja team sync only happen if user active
jabelone May 30, 2024
f0d507c
Added celery task for application level metrics
jabelone May 30, 2024
e3952e6
version bump Python packages
jabelone May 30, 2024
e037872
fix typo in requirements
jabelone May 30, 2024
d0e05a6
add config for danihodovic/celery-exporter
jabelone May 30, 2024
0882e87
update celery metrics typo
jabelone May 31, 2024
0160ef6
add celery Prometheus exporter to caprover and Docker compose
jabelone May 31, 2024
a96886c
prepend all app level metrics with mm_
jabelone May 31, 2024
7d1ff23
add Prometheus metrics server to celery
jabelone May 31, 2024
f02a415
adjust logging
jabelone May 31, 2024
11c5dbf
update celery prom server signal
jabelone May 31, 2024
79d224a
setup api_metrics app and celery task to update them
jabelone May 31, 2024
79af581
fixed typo in metrics
jabelone May 31, 2024
da579e2
fix bug in metrics calc task
jabelone May 31, 2024
defd85f
update calculate metrics task return value
jabelone May 31, 2024
9171ebf
update metrics stored format
jabelone May 31, 2024
4a8fd13
update metric log
jabelone May 31, 2024
bfd7f5c
fixed metrics bug
jabelone Jun 1, 2024
e8b7580
removed old API_SECRET_KEY constance config
jabelone Jun 1, 2024
d2c041d
added 6/12 month membership metrics
jabelone Jun 1, 2024
879fd1e
increased some description fields in models
jabelone Jun 3, 2024
a21d710
added some memberbucks metrics
jabelone Jun 3, 2024
c0be813
added vending discord post and update vending memberbucks log message
jabelone Jun 3, 2024
9a7d084
update import typo
jabelone Jun 3, 2024
fe4ea1f
fix constance grouping
jabelone Jun 3, 2024
00c7a87
removed old, redundant mdns code
jabelone Jun 4, 2024
778b772
replaced all print calls with loggers
jabelone Jun 4, 2024
1d1d565
Make report_online_status default to False for auto provisioned devices
jabelone Jun 4, 2024
6334753
disable (un)lock, sync and reboot buttons on memberbucks devices
jabelone Jun 4, 2024
35f0c2e
removed interlock sync button
jabelone Jun 4, 2024
d77a46a
Merge pull request #266 from membermatters/feature/more-prometheus-me…
jabelone Jun 4, 2024
7eda7ab
refactored/combined the two redundant ManageMemberTier views
jabelone Jun 15, 2024
8c188ba
made membership and payment plan names useful in admin interface
jabelone Jun 15, 2024
d98b91a
refactored and fixed payment plan api
jabelone Jun 15, 2024
8cd5225
fixed can't submit more than one create payment plan forms
jabelone Jun 15, 2024
e19283f
Added settings API
jabelone Jun 16, 2024
94fae1a
Add docs about local Stripe webhooks
jabelone Jun 16, 2024
6f80f54
fixed credit card component min width
jabelone Jun 16, 2024
aebfffa
Fixed inconsistent translations/plurals and billing tab UI improvement
jabelone Jun 16, 2024
5b79b37
fixed billing dates appearing incorrectly
jabelone Jun 16, 2024
85f8f15
Added support for assigning a plan manually and allowing a member to …
jabelone Jun 16, 2024
93dba18
added migrations
jabelone Jun 16, 2024
650aab0
made member states consistent
jabelone Jun 22, 2024
fcfe307
update path aliases in tsconfig for better intellisense
jabelone Jun 22, 2024
1a88239
added member tier and plan to manage member screen
jabelone Jun 22, 2024
830a425
Fixed memberlist filter typo
jabelone Jun 24, 2024
60cb2d4
Merge pull request #268 from membermatters/fix/membershipplan-fixes
jabelone Jul 2, 2024
549210a
added safeguards for metrics_interval setting
jabelone Jun 7, 2024
9e6a5b0
added stats page and ENABLE_STATS_PAGE/STATS_MAX_DAYS config options
jabelone Jun 7, 2024
4680590
ignore large memberbucks balances for stats
jabelone Jun 7, 2024
dc07d07
added memberbucks balance list
jabelone Jul 13, 2024
95f399a
added manual calculate metrics endpoint
jabelone Jul 13, 2024
2c8168e
rejigged types and added zod
jabelone Jul 13, 2024
d3fe3e0
ignore invalid metrics data when rendering graph
jabelone Jul 13, 2024
6fb8565
update urls
jabelone Jul 13, 2024
ddc86c3
minor bug fixes
jabelone Jul 13, 2024
12b4141
fixed display bug on stats page
jabelone Jul 13, 2024
bc9e840
hide some series by default on metrics page
jabelone Jul 13, 2024
376b238
update metrics graphs to use translations
jabelone Jul 13, 2024
910aa19
Improved access permissions UI
jabelone Jul 13, 2024
d3996e7
Improved manage member UI
jabelone Jul 13, 2024
c56c8b9
Improved homepage cards UI when different sized content
jabelone Jul 13, 2024
0ad734e
Merge pull request #267 from membermatters/feature/more-prometheus-me…
jabelone Jul 13, 2024
24e78de
removed old and unsupported terraform related files
jabelone Aug 4, 2024
2a6a647
Merge pull request #272 from membermatters/fix/remove-old-terraform
jabelone Aug 4, 2024
bf95e94
added report issue vikunja integration
jabelone Aug 7, 2024
c458c09
added vikunja api token/url to config
jabelone Aug 7, 2024
939e3e3
fixed typo in constance
jabelone Aug 7, 2024
7df3c67
cast vikunja label and project ID to int
jabelone Aug 11, 2024
84db9bf
removed deprecated MMDB_SECRET env var
jabelone Aug 11, 2024
e41cc6a
added report issue to discord feature
jabelone Aug 11, 2024
6ba7d5a
Merge pull request #273 from membermatters/feature/vikunja-integration
jabelone Aug 11, 2024
b311f72
v3.7.0
jabelone Aug 11, 2024
162b474
Merge pull request #274 from membermatters/v3.7.0
jabelone Aug 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/comment_wrong_branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Wrong Branch Warning

on:
workflow_dispatch:
pull_request:
types: [opened]
branches:
- "main"

jobs:
comment_warning:
if: ${{ github.event.pull_request.base.repo.clone_url != github.event.pull_request.head.repo.clone_url }}
runs-on: ubuntu-latest
steps:
- name: Comment warning about the wrong branch selected for PR
id: comment_docker_image
uses: actions/github-script@v6
with:
script: |
const output = `
Warning: we only accept PRs to the \`dev\` branch. It looks like you've created a PR to the \`main\` branch. Please edit this PR and select the \`dev\` branch as the target branch instead. If this was intentional please ignore this message.
`;

github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: output
})

comment_warning_internal_pr:
if: ${{ github.event.pull_request.head.ref != 'dev' }}
runs-on: ubuntu-latest
steps:
- name: Comment warning about the wrong branch selected for PR
id: comment_docker_image
uses: actions/github-script@v6
with:
script: |
const output = `
Warning: we only accept PRs to main from the \`dev\` branch. It looks like you've created a PR from a different branch. Please edit this PR and select the \`dev\` branch as the source branch instead. If this was intentional please ignore this message.
`;

github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: output
})
7 changes: 0 additions & 7 deletions .octopus/deployment_settings.ocl

This file was deleted.

1 change: 0 additions & 1 deletion .octopus/schema_version.ocl

This file was deleted.

71 changes: 71 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,77 @@ 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.7.0] - 2024-08-11

### Fixed

- unhandled exception when logging access for non-existent member
- re-sync device if exempt_signin changes
- signals to auto sync access changes to devices in realtime
- device pages not showing bump/manage buttons on mobile
- fixed bugs in devices modal when using next/previous buttons
- weird spacing in the memberbucks UI
- bug with device auth
- bug with swipe denied due to device lockout not logging correctly
- all print calls now use the logging framework properly
- removed interlock sync button because it doesn't do anything for interlocks
- membership and payment plan names show useful info in django admin interface
- #259 adding duplicate payment plan fails
- credit card component width issues on small screens
- Fixed inconsistent translations/plurals and billing tab UI improvement
- fixed billing dates appearing incorrectly
- made member states more consistent in the UI
- bug in member list filter dropdown
- homepage cards showing inconsistent heights

### Added

- memberbucks products and a vending machine API to track product purchases and profits
- post to discord for vending machine purchases
- memberbucks devices to the devices page
- Vikunja teams sync via oauth / oidc claims
- Vikunja integration for the report issues form
- Discord integration for the report issues form
- a bunch of native MM metrics for things like membership count, memberbucks in circulation, etc.
- lots of prometheus metrics have been added
- all db models
- celery tasks
- all django views
- all native MM metrics (see above)
- warning comment about PRs that target main directly
- per app level logging configuration (check env var definitions in settings.py)
- tracking of total purchases to memberbucks devices
- make offline devices more obvious and disable buttons that require them to be online
- shows if a device currently has a maintenance lockout on the permissions page
- admin permissions page shows warning if a member's access is inactive or device is locked out
- API to dynamically update all constance settings using REST API
- docs about using the local Stripe CLI for testing webhooks
- Added support for assigning a plan manually and allowing a member to resume it
- membership plan info to member admin page
- ignore large (> $1k) transactions when calculating memberbucks metrics (to prevent outliers/test transactions)

### Changed

- documentation improvements (thanks @ergodone)
- increased docker image python version to 3.12
- increased docker image Node version to 22
- updated Stripe node module version
- refactored memberbucks APIs (including new WS commands to support vending machine products)
- increased the length of some description fields in models for new vending machine API
- Make report_online_status default to False for auto provisioned devices
- refactored the two redundant member tier views
- refactored payment plans api
- improved member access permissions UI
- improved manage member admin page UI

### Removed

- old API_SECRET_KEY constance config
- old redundant mdns code
- old and unsupported terraform related files
- old and unsupported MMDB_SECRET env var

## [v3.6.3] - 2024-04-08

### Fixed
Expand Down
49 changes: 0 additions & 49 deletions Dockerfile.copilot

This file was deleted.

4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright 2020 MemberMatters (Jaimyn Mayer and others)
# Copyright 2024 MemberMatters (Jaimyn Mayer and others)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1 change: 0 additions & 1 deletion copilot/.workspace

This file was deleted.

1 change: 0 additions & 1 deletion copilot/README.md

This file was deleted.

Loading
Loading