Guestacc #33
Guestacc #33
Conversation
stuudmuffin
left a comment
stuudmuffin
left a comment
There was a problem hiding this comment.
After merging the new auth code, I updated the beta-auth branch from the master so it would match.
I'm unsure if anything in this pull request is new or different from the master. git handles file changes from different branches into master fairly well. So merges from one branch to another, unless specifically testing a variation of code, is not really needed.
zackman0010
dismissed
stuudmuffin’s stale review
I have changed the base from beta-auth to master. I told him to merge into beta-auth because this work is working on making a viable guest page, one without any of the server control functions and view only access. I wanted to link this into Discord Auth so that we didn't just kill if a user wasn't a Mod or Admin.
|
ah.. merge conflict is because altlogin.php is now old login.php, I think. |
|
Can you confirm that your changes to the code still work with the base changed? |
|
Done. |
|
I mean altlogin is working.. Can't test auth login and user level things there. But no more conflicts. |
|
@stuudmuffin Want to go ahead and merge this? |
|
Changing it back to beta-auth and merging it. I'm gonna test and make sure it all works in production before I merge back into master. |
3 participants
No description provided.