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

Rebased add EULAs #671

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rebased add EULAs #671

wants to merge 1 commit into from

Conversation

jrlagrone
Copy link

Merged and resolved conflicts between main and #609, rebased into a single commit and signed.

@jrlagrone
Squashed commit of the following:
3b272b5 
commit db0283e
Author: John LaGrone <[email protected]>
Date:   Wed Apr 2 08:59:54 2025 -0500

    activate user when they accept eula

commit 4e1ddad
Author: John LaGrone <[email protected]>
Date:   Wed Apr 2 08:58:11 2025 -0500

    only send activate if eula is active

commit 731d52d
Merge: a4d5ac5 7aeded9
Author: John LaGrone <[email protected]>
Date:   Wed Apr 2 08:53:21 2025 -0500

    Merge branch 'main' into add_eula_enforcement

commit a4d5ac5
Author: John LaGrone <[email protected]>
Date:   Fri May 10 13:12:19 2024 -0500

    remove site specific .gitignore

commit 5545cd3
Author: John LaGrone <[email protected]>
Date:   Fri May 10 12:50:01 2024 -0500

    remove white space

commit 8b458f9
Author: John LaGrone <[email protected]>
Date:   Tue Apr 30 10:40:47 2024 -0500

    only get user status if user is in allocation

commit b248fed
Author: John <[email protected]>
Date:   Fri Apr 12 10:57:16 2024 -0500

    remove import of unused form

commit 7980662
Author: John <[email protected]>
Date:   Fri Apr 12 10:42:28 2024 -0500

    fix some links and remove unused form

commit 0a43c0d
Author: John <[email protected]>
Date:   Fri Apr 12 10:32:53 2024 -0500

    finish moving EULA acceptance /review to it's own page

commit 3546808
Author: John <[email protected]>
Date:   Fri Apr 12 08:49:54 2024 -0500

    start breaking out some eula logic to it's own page

commit 8556e5a
Author: John <[email protected]>
Date:   Fri Apr 12 07:27:17 2024 -0500

    remove debugging / handle reject eula better

commit 1d55c0b
Author: John <[email protected]>
Date:   Thu Apr 11 17:53:09 2024 -0500

    remove debug prints

commit 0b363b1
Author: John <[email protected]>
Date:   Thu Apr 11 17:50:39 2024 -0500

    add more helpful messaging and links for pending allocations

commit 3d44d76
Author: John <[email protected]>
Date:   Thu Apr 11 16:24:46 2024 -0500

    remove another instance of get_eula def

commit bf9ee30
Author: John <[email protected]>
Date:   Thu Apr 11 15:53:22 2024 -0500

    default new users on allocations to pending eula not active

commit a6334f0
Author: John <[email protected]>
Date:   Thu Apr 11 14:59:01 2024 -0500

    remove unused pending allocations

commit dca5baa
Author: John <[email protected]>
Date:   Thu Apr 11 14:45:33 2024 -0500

    refactor to not redfine the same function many times

commit ca141eb
Author: John <[email protected]>
Date:   Thu Apr 11 14:07:45 2024 -0500

    don't default to users being active. They may not have agreed to the EULA

commit da0d7f5
Author: John <[email protected]>
Date:   Thu Apr 11 13:40:22 2024 -0500

    remove more PI prompts to accept user EULA

commit 6a6ed57
Author: John <[email protected]>
Date:   Thu Apr 11 13:36:27 2024 -0500

    don't ask a PI to accept EULA for user

commit c7caf60
Author: John <[email protected]>
Date:   Thu Apr 11 13:21:35 2024 -0500

    fix user in allocation check

commit 7be2046
Author: John <[email protected]>
Date:   Thu Apr 11 10:13:43 2024 -0500

    handled pending eula differently than other cases

commit d35f8f3
Author: John <[email protected]>
Date:   Wed Apr 10 13:06:20 2024 -0500

    only show eula approval to current user

commit a79ba7f
Author: John <[email protected]>
Date:   Wed Apr 10 10:01:42 2024 -0500

    change denied -> deniedeula for clarity

commit 679e261
Author: John <[email protected]>
Date:   Wed Apr 10 09:58:13 2024 -0500

    changing pending -> pendingeula for clarity

commit db0f320
Author: John <[email protected]>
Date:   Wed Apr 10 09:10:55 2024 -0500

    add EULA_AGREEMENT to resource view

commit 76d1d98
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 14:53:14 2023 -0400

    fixed html side of bug

commit 6627fe8
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 14:52:24 2023 -0400

    fixed bug in eula display

commit 709e8c1
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 11:55:26 2023 -0400

    code cleanup

commit 67f62a6
Author: [email protected] <[email protected]>
Date:   Mon Jun 26 11:48:59 2023 -0400

    fixed checkbox functionality

commit 131b361
Author: [email protected] <[email protected]>
Date:   Sun Jun 18 14:21:20 2023 -0400

    fixed display for allocations without eula

commit a78cb0f
Author: [email protected] <[email protected]>
Date:   Sun Jun 18 14:11:58 2023 -0400

    fixed functionality when adding 0 users to allocation

commit ae2cb8f
Author: [email protected] <[email protected]>
Date:   Sun Jun 18 14:01:09 2023 -0400

    fixed formatting and removed comments

commit 3f47066
Author: [email protected] <[email protected]>
Date:   Sun Jun 18 13:58:51 2023 -0400

    done

commit d23c4be
Author: [email protected] <[email protected]>
Date:   Sun Jun 18 12:47:03 2023 -0400

    commit with comments

commit 6ed7dd4
Author: [email protected] <[email protected]>
Date:   Wed Jun 14 18:01:44 2023 -0400

    added ability to prompt users when adding to allocation and have eula show up on allocation detail page

commit 8aec097
Author: Ria Gupta <[email protected]>
Date:   Thu Jul 27 14:13:20 2023 -0400

    Update add_allocation_defaults.py

commit 40beb99
Author: Ria Gupta <[email protected]>
Date:   Thu Jul 27 14:12:46 2023 -0400

    Update add_allocation_defaults.py

commit fcc451c
Author: Ria Gupta <[email protected]>
Date:   Tue Jul 25 15:41:53 2023 -0400

    Update .gitignore

commit d314048
Author: [email protected] <[email protected]>
Date:   Thu Jul 13 15:18:41 2023 -0400

    refactored eula reminder emails

commit 5a32cf4
Author: Ria Gupta <[email protected]>
Date:   Fri Jul 7 20:28:56 2023 -0400

    Update allocation_agree_to_eula.txt

commit 2c1b66e
Author: Ria Gupta <[email protected]>
Date:   Fri Jul 7 20:15:03 2023 -0400

    Update add_scheduled_tasks.py

commit 6d40263
Author: [email protected] <[email protected]>
Date:   Fri Jul 7 20:03:15 2023 -0400

    small fixes

commit 850a223
Author: [email protected] <[email protected]>
Date:   Fri Jul 7 14:41:01 2023 -0400

    config fix

commit e023f7e
Author: [email protected] <[email protected]>
Date:   Fri Jul 7 14:32:51 2023 -0400

    email updates

commit 99825f4
Author: [email protected] <[email protected]>
Date:   Fri Jul 7 14:21:46 2023 -0400

    emails work

commit a8c1667
Author: [email protected] <[email protected]>
Date:   Thu Jul 6 14:03:07 2023 -0400

    bug fix

commit 9a3dd2d
Author: [email protected] <[email protected]>
Date:   Thu Jul 6 13:58:27 2023 -0400

    fixed functionality for when config is false

commit 4a8a14f
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 20:47:53 2023 -0400

    email functionality almost done

commit edd4d13
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 19:03:51 2023 -0400

    functionality near complete

commit 2701732
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 18:56:25 2023 -0400

    email functionality close to working

commit 913594b
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 17:20:46 2023 -0400

    code cleanup

commit 2e9c468
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 16:25:23 2023 -0400

    fixed email

commit 019d7a5
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 16:05:27 2023 -0400

    small change

commit e21f12a
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 15:23:09 2023 -0400

    users can now accept/decline eulas

commit ba9ccf0
Author: [email protected] <[email protected]>
Date:   Wed Jul 5 14:51:32 2023 -0400

    working on agree button

commit a7f6c7c
Author: [email protected] <[email protected]>
Date:   Fri Jun 30 22:04:32 2023 -0400

    started selection functionality

commit 1ca566d
Author: [email protected] <[email protected]>
Date:   Thu Jun 29 15:34:18 2023 -0400

    enabling checkbox functionality

commit 6f26dcf
Author: [email protected] <[email protected]>
Date:   Thu Jun 29 13:54:19 2023 -0400

    working through user statuses

commit 0c361d2
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 17:33:06 2023 -0400

    add config variable check to each part

commit 47f2f3f
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 17:18:17 2023 -0400

    line deletion

commit d9f6bf3
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 17:17:24 2023 -0400

    added email functionality

commit 90d9b5e
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 14:59:23 2023 -0400

    made it so user status is pending when allocation has eula

commit cb60d7c
Author: [email protected] <[email protected]>
Date:   Tue Jun 27 12:34:14 2023 -0400

    started eula user functionality

Signed-off-by: John LaGrone <[email protected]>
@jrlagrone jrlagrone mentioned this pull request Apr 2, 2025
Open
8 tasks
@cecilialau6776
Copy link
Contributor

@aebruno Just wanted to make sure this PR is on the radar. Thank you!

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.
2 participants
@jrlagrone @cecilialau6776