ACM/acm-site
1
0
Fork 0
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Support local accounts #13

Draft
Muirrum wants to merge 1 commit from local-accounts into master
pull from: local-accounts
merge into: ACM:master
Conversation 0 Commits 1 Files changed 6 +101 -5
Muirrum commented 2024-05-03 21:25:02 -04:00 (Migrated from github.com)
Copy link
  • Finish local login page
  • Rework design of login flow selector
  • Allow alternative non-WPI emails to be set
  • Bulk mailer for alumni

Issues:
Closes #8
Closes #6

- [ ] Finish local login page - [ ] Rework design of login flow selector - [ ] Allow alternative non-WPI emails to be set - [ ] Bulk mailer for alumni Issues: Closes #8 Closes #6
This pull request has changes conflicting with the target branch.
  • acmsite/dashboard/__init__.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin local-accounts:local-accounts
git checkout local-accounts

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff local-accounts
git checkout local-accounts
git rebase master
git checkout master
git merge --ff-only local-accounts
git checkout local-accounts
git rebase master
git checkout master
git merge --no-ff local-accounts
git checkout master
git merge --squash local-accounts
git checkout master
git merge --ff-only local-accounts
git checkout master
git merge local-accounts
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ACM/acm-site#13
No description provided.
Delete branch "local-accounts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?