Skip to content
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

Merge develop into main. #230

Merged
merged 172 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
faa1bf9
build(deps): bump sqlparse from 0.4.3 to 0.4.4
dependabot[bot] Apr 21, 2023
35a42a2
fix for prod.
JasonLovesDoggo May 8, 2023
59f451a
fix broken thing :D
JasonLovesDoggo May 10, 2023
2e4e926
FEAT: Added CommentField & LikeCountField
JasonLovesDoggo May 10, 2023
5cceb64
i'm so smart fr.
JasonLovesDoggo May 10, 2023
bcec59e
REVERT: did not mean to push main.py just yet.
JasonLovesDoggo May 10, 2023
666845a
Fix field consistency and updates docs
JasonLovesDoggo May 13, 2023
418d03e
style: fixed formatting
JasonLovesDoggo May 13, 2023
e4e07da
merge some of the main.py changes in. Now just the logic stuff is left.
JasonLovesDoggo May 14, 2023
e2621ae
merge some of the main.py changes in. Now just the logic stuff is left.
JasonLovesDoggo May 14, 2023
56b6503
more changes that are fine.
JasonLovesDoggo May 14, 2023
f525634
committing check_query_params for any potential future useage
JasonLovesDoggo May 15, 2023
8bf7477
API: removed the AND query option due to django giving me a massive h…
JasonLovesDoggo May 15, 2023
d3a96f5
FMT
JasonLovesDoggo May 15, 2023
10336b1
fix: switched bodge to a regex string + fixed said regex
JasonLovesDoggo May 15, 2023
9c1c1c8
fix: tests + some future proofing in terms of bugs.
JasonLovesDoggo May 15, 2023
326dfab
fmt
JasonLovesDoggo May 15, 2023
fa9c0cb
fix: ContentTypeField failing tests
JasonLovesDoggo May 15, 2023
a6da647
massively important commit that must be pushed
JasonLovesDoggo May 17, 2023
c1a199b
docs: misstype
JasonLovesDoggo May 17, 2023
51d4c49
typehint
JasonLovesDoggo May 17, 2023
5c1d8c9
readme: run make for setup
nyiyui May 19, 2023
33691d2
Merge pull request #209 from wlmac/dependabot/pip/sqlparse-0.4.4
JasonLovesDoggo May 19, 2023
d86c09e
Bump redis from 3.5.3 to 4.4.4
dependabot[bot] May 19, 2023
b526d79
Merge pull request #208 from wlmac/dependabot/pip/redis-4.4.4
JasonLovesDoggo May 19, 2023
3cbad41
added gravatar
JasonLovesDoggo May 20, 2023
e1b0bdb
notifs: add blog notif category
nyiyui May 22, 2023
540711b
cleanup and add qol features
nyiyui May 22, 2023
36da6f1
Bump requests from 2.28.2 to 2.31.0
dependabot[bot] May 22, 2023
55b00d9
fix typo
nyiyui May 22, 2023
47e467d
maybe fix "TypeError: cannot unpack non-iterable bool object"
nyiyui May 22, 2023
676f97d
api/notif: impl allowing notifications
nyiyui May 22, 2023
417f415
add sac election schedule
nyiyui May 29, 2023
64c9957
sac election schedule: fix time formatting
nyiyui May 29, 2023
bf07a1b
notifs: handle null
nyiyui May 29, 2023
514233a
singleday: change to 18:00 on the day before
nyiyui May 29, 2023
088e48c
singleday: fix admin action
nyiyui May 29, 2023
af2afe6
models: post: handle NoneType user
nyiyui May 30, 2023
79fc840
fmt + fixed ann lists.
JasonLovesDoggo May 31, 2023
7340104
api3: user: add organizations_leading
nyiyui Jun 4, 2023
dddf252
added an option for listing filters to specify the db value to compar…
JasonLovesDoggo Jun 5, 2023
c5b3a13
todo's
JasonLovesDoggo Jun 5, 2023
b5135c6
commit to test diff
JasonLovesDoggo Jun 5, 2023
7429239
update graduating year choice (-2023 and +2027)
nyiyui Jun 28, 2023
3778eca
Bump pygments from 2.11.2 to 2.15.0
dependabot[bot] Jul 20, 2023
e77dc15
fixed a 500 on api/v3/obj/timetable
JasonLovesDoggo Jul 30, 2023
9d480dd
Bump cryptography from 40.0.2 to 41.0.3
dependabot[bot] Aug 2, 2023
e85439b
Merge pull request #219 from wlmac/dependabot/pip/cryptography-41.0.3
JasonLovesDoggo Aug 2, 2023
985c2b0
Merge pull request #217 from wlmac/dependabot/pip/pygments-2.15.0
JasonLovesDoggo Aug 2, 2023
890a447
Merge pull request #212 from wlmac/dependabot/pip/requests-2.31.0
JasonLovesDoggo Aug 2, 2023
3d9aa2c
Bump certifi from 2022.12.7 to 2023.7.22
dependabot[bot] Aug 2, 2023
7f61c50
Merge pull request #218 from wlmac/dependabot/pip/certifi-2023.7.22
JasonLovesDoggo Aug 2, 2023
52e6ca7
make "draft" the default status for announcements
nyiyui Aug 27, 2023
a7fdc7d
envrc: support poetry
nyiyui Aug 27, 2023
f31a4e8
map: add link to PDF in case map is broken
nyiyui Sep 6, 2023
a5d819b
script for updating METROPOLIS_STAFFS
nyiyui Sep 8, 2023
6860340
style: cleared some todos
JasonLovesDoggo Aug 5, 2023
28c1cf8
feat: added actions to set clubs to active or not.
JasonLovesDoggo Sep 8, 2023
c5b6eb1
feat: added action to reset club execs
JasonLovesDoggo Sep 8, 2023
e5ed3e2
refactor: moved all admin actions to utils/actions for simplification.
JasonLovesDoggo Sep 11, 2023
64eae6f
fix: i'm a clown
JasonLovesDoggo Sep 11, 2023
22d3d58
removed is_archived from admin fields
JasonLovesDoggo Sep 11, 2023
67d0918
chore: added new p/vp info (-horman)
JasonLovesDoggo Sep 12, 2023
616ffbb
added the last email in
JasonLovesDoggo Sep 13, 2023
ebdc741
Fix view on site url on admin flatpage
wither-rose Sep 15, 2023
c3f3845
fix: small error with HttpResponseBadRequest not actually being raise…
JasonLovesDoggo Sep 17, 2023
bb3dc7c
simple gha test to fic the issue
JasonLovesDoggo Sep 17, 2023
86e156c
temp fix (tests): so the tests actually work and the channel looks go…
JasonLovesDoggo Sep 17, 2023
70e85e1
fix (announcements): posts posting too early
JasonLovesDoggo Sep 21, 2023
ef3bf44
removed untrue comment.
JasonLovesDoggo Sep 21, 2023
b5d4935
build(deps): bump cryptography from 41.0.3 to 41.0.4
dependabot[bot] Sep 21, 2023
f993473
Merge pull request #222 from wlmac/dependabot/pip/cryptography-41.0.4
JasonLovesDoggo Sep 21, 2023
6cd3c99
chore: updated to django 4.1.10 for bug fixes
JasonLovesDoggo Sep 21, 2023
dba86af
chore (migrations) updates to allow 4.1 to work.
JasonLovesDoggo Sep 22, 2023
9f7d5d4
test of new solution
JasonLovesDoggo Sep 22, 2023
73efc65
chore (migrations): cleaned up the merged migrations
JasonLovesDoggo Sep 22, 2023
891e9ac
updated to be native migration
JasonLovesDoggo Sep 22, 2023
57a414b
feat: added a sitemap
JasonLovesDoggo Sep 22, 2023
ce6ce8d
update freq on sitemaps.py
JasonLovesDoggo Sep 23, 2023
5605e97
current version of club automation
JasonLovesDoggo Sep 23, 2023
3eb22fa
feat (organizations): added full automation for user groups.
JasonLovesDoggo Sep 23, 2023
28be5be
feat (organizations): added small script to clean up the groups
JasonLovesDoggo Sep 23, 2023
91cbb07
fix (events): make end_date + start_date time always time aware to fi…
JasonLovesDoggo Sep 23, 2023
0561453
removed the migration script.
JasonLovesDoggo Sep 23, 2023
a8da27c
fix: small typo
JasonLovesDoggo Sep 23, 2023
61f16f8
fix: left the script call in.
JasonLovesDoggo Sep 23, 2023
5f06d66
fix: added is_staff flag as I forgot that and added to migrations
JasonLovesDoggo Sep 23, 2023
f5f3ee5
fix: forgot to include teachers....
JasonLovesDoggo Sep 23, 2023
5b56c0f
rerun
JasonLovesDoggo Sep 23, 2023
04070b0
rerun
JasonLovesDoggo Sep 23, 2023
7c59d30
feat (sitemap): added clubs to sitemap
JasonLovesDoggo Sep 23, 2023
f2cde8b
feat (sitemap): added pinging on creation.
JasonLovesDoggo Sep 24, 2023
7bcf7d3
removed the task as google perodically looks anyways
JasonLovesDoggo Sep 24, 2023
3126eb9
style: pep8 go brrt
JasonLovesDoggo Sep 24, 2023
0d316b5
updated about.html
JasonLovesDoggo Sep 25, 2023
1373c84
updated README with new project limitations.
JasonLovesDoggo Sep 25, 2023
ebfb033
chore: updated reqs
JasonLovesDoggo Sep 26, 2023
d391d83
fix: I am a dumbdfunbmskfjsdifsd
JasonLovesDoggo Sep 26, 2023
46500a4
tiny switch
JasonLovesDoggo Sep 27, 2023
48a2fad
update for clear unused owners task
JasonLovesDoggo Sep 27, 2023
7a4f5a1
limit image sizes to 200
nyiyui Sep 26, 2023
266b365
admin: announcement: make supervisor read-only
nyiyui Sep 27, 2023
840a980
nix flake update
nyiyui Sep 27, 2023
3283c25
make requirements.txt
nyiyui Sep 27, 2023
a644cb1
API (flatpages): allowed listing + allowed filtering by ID in additio…
JasonLovesDoggo Oct 2, 2023
d175346
TV (clubs): Updated club crawl info.
JasonLovesDoggo Oct 2, 2023
80706ff
fix requirements.txt format
nyiyui Sep 29, 2023
57d2494
tv/clubs: update layout for club crawl tomorrow (!)
nyiyui Oct 2, 2023
b6a07e0
tv/clubs: add Makefile
nyiyui Oct 2, 2023
aaeace1
Updated Setfield to contain missing method
JasonLovesDoggo Oct 2, 2023
4292ea8
Clubs: added INYA
JasonLovesDoggo Oct 2, 2023
71b52f6
clubs: fixed smul bug
JasonLovesDoggo Oct 2, 2023
94026fb
clubs (listing): fixed color bug.
JasonLovesDoggo Oct 2, 2023
e3e694e
refactored migrate, still need to add supervisors checked.
JasonLovesDoggo Oct 4, 2023
04fd4fa
scripts (migration groups): Added supervisor/teacher stuff
JasonLovesDoggo Oct 4, 2023
486b554
scripts (migration groups): Updated supervisor/teacher stuff
JasonLovesDoggo Oct 4, 2023
9f90b54
Groups (supervisors): automated receiving/removal.
JasonLovesDoggo Oct 4, 2023
dbc4bf0
feat: added django-hijack for only Mine & Ken's usage
JasonLovesDoggo Oct 7, 2023
6b8edbd
updated comment
JasonLovesDoggo Oct 8, 2023
e1029a4
chore: updated packages
JasonLovesDoggo Oct 8, 2023
b320001
fix: (hijack) perm check
JasonLovesDoggo Oct 12, 2023
5f34f6e
build(deps): bump urllib3 from 2.0.6 to 2.0.7
dependabot[bot] Oct 17, 2023
393aa53
fix: updated the sched options for 2022-23/23-24 late start
JasonLovesDoggo Oct 19, 2023
4822fd5
fix (temp): updated timetable sched
JasonLovesDoggo Oct 19, 2023
df3f743
add 2023-2024 schedule
nyiyui Oct 18, 2023
3de1123
reverted: late start changed on 2022-23 and added a 2023-24 field.
JasonLovesDoggo Oct 19, 2023
7cf4199
fix (GHA): import issue
JasonLovesDoggo Oct 19, 2023
2879114
feat: added resend email admin action along with ratelimiting.py for it
JasonLovesDoggo Oct 19, 2023
709b0b6
fix: banner on prod.
JasonLovesDoggo Oct 19, 2023
30adbdd
Merge pull request #228 from wlmac/dependabot/pip/urllib3-2.0.7
JasonLovesDoggo Oct 19, 2023
652209f
removed useless imports and updated JWT token times.
JasonLovesDoggo Oct 20, 2023
25d6c60
added additional logging to repo.
JasonLovesDoggo Oct 22, 2023
41c0b43
requirements: updated requirements (specifically pytz)
JasonLovesDoggo Oct 22, 2023
64f61d3
slight pep change
JasonLovesDoggo Oct 22, 2023
145c800
CI: Added Qodana
JasonLovesDoggo Oct 22, 2023
dbb92ea
CI: Updated qudana
JasonLovesDoggo Oct 22, 2023
7e93c2a
added admin password reset form.
JasonLovesDoggo Oct 24, 2023
046a0d4
format: Optimized imports
JasonLovesDoggo Oct 24, 2023
ae27f30
updated ratelimiting.py to support arguments and scope.
JasonLovesDoggo Oct 24, 2023
aad27e3
Improved ratelimiting all around.
JasonLovesDoggo Oct 24, 2023
2f7e6db
feat/fix: admin: made it that you cannot reset a SU's password in the…
JasonLovesDoggo Oct 24, 2023
c5a648a
slight stylistic change.
JasonLovesDoggo Oct 24, 2023
467509d
added one last flag for action ratelimiting.
JasonLovesDoggo Oct 24, 2023
a9b5ca0
pepp
JasonLovesDoggo Oct 24, 2023
f6e9457
pepp p2.
JasonLovesDoggo Oct 24, 2023
8f1f83c
chore: update reqs
JasonLovesDoggo Oct 29, 2023
4535f64
chore: updated requirements.txt
JasonLovesDoggo Oct 29, 2023
bfc86ef
updated gha to work with main branch.
JasonLovesDoggo Oct 29, 2023
0371f63
CI: removed Qodana
JasonLovesDoggo Oct 29, 2023
17f8093
fixed settings.py
JasonLovesDoggo Oct 31, 2023
5efac2b
fixed downed metro
JasonLovesDoggo Oct 31, 2023
d888bbb
remove captcha references
JasonLovesDoggo Oct 31, 2023
42a3d89
fix (doodle): Oauth failing
JasonLovesDoggo Nov 1, 2023
eaca616
build(deps): bump django from 4.1.10 to 4.1.13
dependabot[bot] Nov 2, 2023
73f4fba
Merge pull request #231 from wlmac/dependabot/pip/django-4.1.13
JasonLovesDoggo Nov 2, 2023
067ef70
fix (notifs): attempt to update pytz to fix the timezone issue.
JasonLovesDoggo Nov 3, 2023
adf2fce
upgrade django to 4.1.13 for security fix and try to get celery to work.
JasonLovesDoggo Nov 3, 2023
ae94d0c
fix (Celery): incorrect timezone naming.
JasonLovesDoggo Nov 4, 2023
0a4b702
slight note.
JasonLovesDoggo Nov 4, 2023
8068974
feat: added Error Checking to the notif workers.
JasonLovesDoggo Nov 4, 2023
e9b723d
added makemigrations to docker_entrypoint.sh
JasonLovesDoggo Nov 5, 2023
fbf9dcc
some minor adjustments.
JasonLovesDoggo Nov 5, 2023
9da1bd6
fix (martor): skuffed patch
JasonLovesDoggo Nov 7, 2023
d61bf74
fix (martor): less skuffed
JasonLovesDoggo Nov 7, 2023
23ddbbc
updated docker-compose.yml to reflect server changes.
JasonLovesDoggo Nov 14, 2023
8487a57
updated /api/v3/banner
JasonLovesDoggo Nov 14, 2023
a2be042
updated banner API implementation to support blank keys.
JasonLovesDoggo Nov 14, 2023
9c3e65a
update banner impl to banner3
JasonLovesDoggo Nov 14, 2023
54fbb59
added noopener just in case.
JasonLovesDoggo Nov 14, 2023
86a5186
updated settings.py
JasonLovesDoggo Nov 14, 2023
7453a33
chore: (settings) removed banner2
JasonLovesDoggo Nov 14, 2023
6a536d8
updated settings to allow theme to be changed in local_settings.py & …
JasonLovesDoggo Nov 14, 2023
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
14 changes: 14 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
# layout_poetry copied from <https://rgoswami.me/posts/poetry-direnv/>.
layout_poetry() {
if [[ ! -f pyproject.toml ]]; then
log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
exit 2
fi

local VENV=$(dirname $(poetry run which python))
export VIRTUAL_ENV=$(echo "$VENV" | rev | cut -d'/' -f2- | rev)
export POETRY_ACTIVE=1
PATH_add "$VENV"
}

use flake
layout_poetry
4 changes: 2 additions & 2 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Jekyll

on:
push:
branches: ["master"]
branches: ["master", "main"]
workflow_dispatch:

permissions:
Expand All @@ -23,7 +23,7 @@ jobs:
- uses: actions/configure-pages@v2
- uses: actions/jekyll-build-pages@v1
with:
source: ./
source: ./docs
destination: ./_site
- uses: actions/upload-pages-artifact@v1

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ node_modules/
/playwright-report/
/playwright/.cache/
celerybeat-schedule
/mobile
/doodle
29 changes: 18 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
default_language_version:
python: python
repos:
- repo: https://github.com/psf/black
rev: 21.10b0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
rev: 5.10.1
hooks:
- id: isort
default_language_version:
python: python
repos:
- repo: https://github.com/psf/black
rev: 21.10b0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
rev: 5.10.1
hooks:
- id: isort
- repo: local
hooks:
- id: make-requirements
name: "Make requirements.txt"
entry: make
language: system
args: [ "requirements.txt" ]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metropolis/local_settings.py:
cp metropolis/local_settings_sample.py metropolis/local_settings.py

requirements.txt: poetry.lock
poetry run pip freeze -> $@ --exclude metropolis
poetry export --without-hashes --format=requirements.txt > $@

test:
cd tests && docker compose up --build
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Metropolis (Backend)

Make sure you have python 3.9+ installed. As of now, the project is only compatible with versions between python 3.9 and 3.10.11.
## Running Locally

Recommended: install [Nix](https://nixos.org/download) and [direnv](https://direnv.net) and run:
```sh
make
direnv allow
./manage.py migrate
nix run
Expand Down
Loading
Loading