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

Deploy to stage #857

Merged
merged 75 commits into from
Dec 6, 2024
Merged
Changes from 2 commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
bda2416
Map authenticated users to a Django group
amstilp Sep 4, 2024
0c8e129
Switch UploadCycleDetail to be visible by View users
amstilp Sep 4, 2024
8ae5e00
Make the upload cycle detail page a bit prettier
amstilp Sep 4, 2024
8ed852f
Show an alert indicating if the upload cycle is current, past, or future
amstilp Sep 4, 2024
772b209
Switch icon for combined workspace
amstilp Sep 4, 2024
552f332
Only show upload cycle notes to staff users
amstilp Sep 4, 2024
b33c940
Only UploadWorkspaceDetail links to users with access
amstilp Sep 4, 2024
8d60961
Allow view users to see UploadCycleList
amstilp Sep 4, 2024
70c1912
Add content to the home page
amstilp Sep 4, 2024
b7fc012
Add description and links to home page
amstilp Sep 5, 2024
68fb593
Wording modifications
amstilp Sep 5, 2024
33bc3bb
Show combined workspace before upload workspaces
amstilp Sep 5, 2024
839f004
Show accordions uncollapsed by default
amstilp Sep 5, 2024
bd85e08
Only show combined and upload workspaces to view users
amstilp Sep 5, 2024
9cd4d00
Merge branch 'main' into feature/open-views-to-investigators
amstilp Oct 23, 2024
17d0935
Update workspace detail pages for view users
amstilp Oct 23, 2024
dc6df37
Improve tests checking for main ACM index link
amstilp Oct 23, 2024
173831c
Run ruff format
amstilp Oct 23, 2024
6a3698b
Bump werkzeug from 3.1.2 to 3.1.3
dependabot[bot] Nov 8, 2024
51b5723
Switch ACM to v0.26 in requirements file
amstilp Nov 12, 2024
8c4c6ab
Compile requirements files
amstilp Nov 12, 2024
3d16ae3
Merge pull request #832 from UW-GAC/pip-tools/update-requirements-fil…
amstilp Nov 12, 2024
5fcdcf8
Move account related settings into adapter
amstilp Nov 12, 2024
2bc9f01
Uncomment lines in account adapter
amstilp Nov 12, 2024
522554d
Merge pull request #831 from UW-GAC/maint/acm-v0.26
amstilp Nov 12, 2024
b07e1fb
Bump django-allauth from 65.1.0 to 65.2.0
dependabot[bot] Nov 12, 2024
203ff2d
Merge branch 'main' into feature/open-views-to-investigators
amstilp Nov 12, 2024
aeda042
Update text on home page
amstilp Nov 12, 2024
54de6ef
Add custom text to UploadWorkspace list page
amstilp Nov 12, 2024
38bfe8a
Add custom text to combined workspace page
amstilp Nov 12, 2024
fe2536e
Add custom text to exchange workspace template
amstilp Nov 12, 2024
0fb96c6
Bump mysqlclient from 2.2.5 to 2.2.6
dependabot[bot] Nov 13, 2024
37d365c
Reorder registered workspace types
amstilp Nov 14, 2024
8522653
Allow only 4 maximum processes for pytest
amstilp Nov 14, 2024
ab6dcf2
Bump ruff from 0.7.2 to 0.7.4
dependabot[bot] Nov 15, 2024
62ae5db
Bump codecov/codecov-action from 4.6.0 to 5.0.7
dependabot[bot] Nov 21, 2024
777a730
Add redirectview for favicon.ico to our custom favicon. Make redirect…
jmcarson Nov 21, 2024
a381456
Minor linting changes
jmcarson Nov 21, 2024
a320f5f
Merge pull request #840 from UW-GAC/maint/favicon-notfound
jmcarson Nov 21, 2024
30c4b2b
Merge dependabot/github_actions/codecov/codecov-action-5.0.7 into com…
github-actions[bot] Nov 21, 2024
67782e7
Merge dependabot/pip/ruff-0.7.4 into combined-prs-branch
github-actions[bot] Nov 21, 2024
5f87362
Merge dependabot/pip/mysqlclient-2.2.6 into combined-prs-branch
github-actions[bot] Nov 21, 2024
1efb532
Merge dependabot/pip/werkzeug-3.1.3 into combined-prs-branch
github-actions[bot] Nov 21, 2024
ea71046
Merge dependabot/pip/django-allauth-65.2.0 into combined-prs-branch
github-actions[bot] Nov 21, 2024
4388e8b
Merge branch 'main' into combined-prs-branch
github-actions[bot] Nov 21, 2024
200e982
Merge pull request #841 from UW-GAC/combined-prs-branch
amstilp Nov 22, 2024
9e0958e
Bump pyjwt from 2.9.0 to 2.10.0
dependabot[bot] Nov 22, 2024
c25a2a6
Fix breaking change in 2.10 - sub must be a string - to align with JW…
jmcarson Nov 22, 2024
e5bf0bd
Merge pull request #837 from UW-GAC/dependabot/pip/pyjwt-2.10.0
jmcarson Nov 22, 2024
fd36515
Bump cryptography from 43.0.3 to 44.0.0
dependabot[bot] Nov 27, 2024
0f2db28
Bump pyjwt from 2.10.0 to 2.10.1
dependabot[bot] Nov 28, 2024
90c51da
Bump ruff from 0.7.4 to 0.8.1
dependabot[bot] Nov 29, 2024
7bfad31
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 2, 2024
1bb1130
Bump pyjwt from 2.10.0 to 2.10.1 in /requirements
dependabot[bot] Dec 2, 2024
5f2fc74
Compile requirements files
dependabot[bot] Dec 2, 2024
cbaa696
Bump django-allauth from 65.2.0 to 65.3.0
dependabot[bot] Dec 2, 2024
2a62ad6
Bump pytest from 8.3.3 to 8.3.4
dependabot[bot] Dec 2, 2024
53af7c3
Merge pull request #847 from UW-GAC/pip-tools/update-requirements-fil…
amstilp Dec 2, 2024
77370ea
Merge dependabot/pip/pytest-8.3.4 into combined-prs-branch
github-actions[bot] Dec 2, 2024
88bfda1
Merge dependabot/pip/django-allauth-65.3.0 into combined-prs-branch
github-actions[bot] Dec 2, 2024
ea6729d
Merge dependabot/pip/requirements/pyjwt-2.10.1 into combined-prs-branch
github-actions[bot] Dec 2, 2024
2a16ff8
Merge dependabot/pip/ruff-0.8.1 into combined-prs-branch
github-actions[bot] Dec 2, 2024
bcae859
Merge dependabot/pip/pyjwt-2.10.1 into combined-prs-branch
github-actions[bot] Dec 2, 2024
b4ebc46
Merge dependabot/pip/cryptography-44.0.0 into combined-prs-branch
github-actions[bot] Dec 2, 2024
ab7d878
Merge pull request #850 from UW-GAC/combined-prs-branch
amstilp Dec 2, 2024
896adb7
Merge pull request #798 from UW-GAC/pre-commit-ci-update-config
amstilp Dec 2, 2024
0891a0f
Split some tables into staff vs. regular user tables
amstilp Dec 2, 2024
5397ce4
Clean up coverage and add more tests for links in detail views
amstilp Dec 3, 2024
1587f3b
Merge pull request #789 from UW-GAC/feature/open-views-to-investigators
amstilp Dec 3, 2024
7e42195
Update ACM version in requirements.in file
amstilp Dec 3, 2024
0e87cc3
Compile requirements files
amstilp Dec 3, 2024
fa23196
Merge pull request #852 from UW-GAC/pip-tools/update-requirements-fil…
amstilp Dec 3, 2024
73a8286
Merge pull request #851 from UW-GAC/maint/acm-v0.26.1
amstilp Dec 3, 2024
7a095a0
Use release-drafter action draft releases and notes
amstilp Dec 6, 2024
436098b
Merge pull request #856 from UW-GAC/maint/release-drafter
amstilp Dec 6, 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
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ idna==3.7
# via requests
jsonapi-requests==0.8.0
# via -r requirements/requirements.in
mysqlclient==2.2.5
mysqlclient==2.2.6
# via -r requirements/requirements.in
networkx==3.1
# via django-anvil-consortium-manager