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.

Sign up for GitHub

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

Jump to bottom

merge and refactor #220

Merged
merged 251 commits into from
May 22, 2023
Merged

merge and refactor #220

merged 251 commits into from
May 22, 2023

Conversation

claire-peters
Copy link
Collaborator

No description provided.

rg663 and others added 30 commits June 8, 2022 15:12
@rg663
admin resource list sorted case insensitive alpha
83bec16
@rg663
allocation and resource attribute listings sorted CI alpha
9b0446a
@aestoltm
Tested Django querying and reverse related object lookup for revamp i…
052c5eb 
…mplementation
@aestoltm
Planned structure for revamp implementation
2eb6ca5
@rg663
child resources sorted CI
9a93abe
@aestoltm
First attempt at email revamp
0246602
@aestoltm
Email revamp close to completion, need more rigorous testing.
fb113bd
@aestoltm
Commit before to allow changes from master to be pulled and merged
2e82345
@aestoltm
Merge remote-tracking branch 'origin/master' into #270-combine-alloca…
36f46fe 
…tion-email-expirations
@aestoltm
Updated attach allocation links to projects and when they are expiring
11f8b81
@aestoltm
Structure of email revamp is complete. Just need to add resource name…
922b29b 
… tied to each allocation, then perform final testing.
@aestoltm
Added resource parent name to each allocation that is expiring or exp…
971065f 
…ired. Finished implementation of sending emails for expired allocations
@aestoltm
Final commit before creating PR, need to merge CCR master branch into…
b6a051b 
… current branch to be up to date.
@aestoltm
Merge remote-tracking branch 'origin/master' into #270-combine-alloca…
96fe44f 
…tion-email-expirations
@rg663
help button only appears if user adds center url
a41c281
@rg663
changed default center name to HPC center
4c85552
@rg663
no longer says "removed 1 users"
a34ad02
@aestoltm
First attempt at adding email notifications on expired allocations fo…
a5ecc3f 
…r center staff
@aestoltm
Updated admin emails
2a64403
@mdzik
Add partial match for attribute search ICM#306
ee65ba3
@mdzik
Add AccHr and Storage metrics import from XDMoD
83940ea
@mdzik
naming typo in xdmod
8815db1
@mdzik
Typos
5f64ec0
@mdzik
Add GPUh support for XDMOD synchronisation
e260e7b
@mdzik
Arguments in signal def are obsolete
9974510
@rg663
allocation/ resource attribute lists sorted CI
e9940bd
@rg663
make migrations to sort lists
339ec24
@rg663
migrations edited for sorting CI
872e380
@rg663
button now displays "Activate" without attributes
16e3bd4
@aebruno
Merge pull request ubccr#417 from rg663/help-button-fixes
b345846 
Miscellaneous config issues fixed
claire-peters and others added 28 commits May 16, 2023 11:30
@claire-peters
change name of projectusermessage message in admin view
30ff6cf
@claire-peters
update archived project list template
4fdb017
@claire-peters
change allocation request button text
73b28d6
@claire-peters
add tests for ProjectDetail and archived project Views
93d3bf0
@claire-peters
add UI element permissions
fbeb213
@claire-peters
add warning about inactive/denied allocations
1d4e28c
@claire-peters
remove clashing datatables css reference
a1044aa
@claire-peters
reduce length of Notification Enabled header text
dae2395
@claire-peters
make single function for creation of test data, add more tests
7df4f52
@claire-peters
fix minor view bugs
c1ffbb7
@claire-peters
nese data processing
c348f8a
@claire-peters
start using Factories in Department tests
4411735
@claire-peters
Convert Department tests to Fixture-based
a94a008
@claire-peters
clean up PDF-related code in allocation
ed5bfcb
@claire-peters
remove commented-out code from templates
3cfca30
@claire-peters
correct logging path
038c45a
@claire-peters
replace plugin test fixtures with factories
5c58e2a
@claire-peters
replace fixtures with factory in sftocf; remove test fixtures
2d8f323
@claire-peters
Merge branch 'development' into cp_softmerge
4ed3e1f
@claire-peters
update requirements
3f3ff82
@claire-peters
Merge branch 'cp_softmerge' of https://github.com/fasrc/coldfront int…
327e8c2 
…o cp_softmerge
@claire-peters
add allocationchangestatuschoices to test data setup
573e2f7
@claire-peters
change path to look for subdirectory attr name instead of ID
e545d58
@claire-peters
add basic access tests to allocation view tests
e7c7671
@claire-peters
add project migration merge file
cd7bf6f
@claire-peters
add migration with project note changes
1cf228c
@claire-peters
add department migration
cc27f10
@claire-peters
add project tests, generic note update template
0be683c
@claire-peters claire-peters merged commit e5a06fb into development May 22, 2023
@claire-peters claire-peters deleted the cp_softmerge branch June 8, 2023 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@claire-peters @rg663 @aestoltm @mdzik @aebruno @dsajdak