Jarrod display player region #221
Conversation
- Changed pull of entrantScore to get method for error handling. - Refactored extra match details pull
Smash GG - DQ's and Bracket Selection
* Query player list locally for player dropdown feature. Don't hammer the server with pointless requests. * pull all players from server so searchbar can search all players * sort player name matches by quality of match
…rged players in alias suggestion (#88)
…hould run this file instead of start.sh
… un/pw in plaintext to dev console)
* ignore OOR players * this commit should fix the region stuff * fixed rankings for merge
…GARPR to NOTGARPR
…nt. Added functions for submitting respective forms.
…eckbox regions. Refactored js variables into one postParams variable.
…ipt for inserting regions. needs testing.
… Super privileges now
|
changes here start at 12f4659 |
|
can you make the base branch something less far away? o.o |
|
I think we'd need to rebase, which I'm not super duper familiar with. |
|
I'll see what I can do tho |
|
rebasing is easy! ish |
|
I know you taught me a command once, it was like where X is the number of commits back you want your base to start... iirc |
BrandonCookeDev
changed the base branch from
master
to
brandon-adminconsole-usersgui
BrandonCookeDev
changed the base branch from
brandon-adminconsole-usersgui
to
master
|
well, you can do that to edit your commit history, roughly I'm just really confused how this branch is based on such an old commit; shouldn't people have checked out master and developed on top of it? |
|
oh this is a 2016 branch LOL imo you should just create a new branch off master, and cherry-pick the commits you want onto it ... wait is it? i'm so confused |
|
I tried creating a new branch and then rebasing a commit range After some reading, I've been trying to run something like this on another branch and I'm not getting much luck: Thoughts? |
|
I feel like this should work? I'm not sure what commits you want exactly |
|
That range in the cherry pick statement is the range that comprises the changes this or should reflect Maybe I'm doing something wrong? I should just be able to run this from a totally new branch off master right? |
|
Closed bad PR. New PR at #224 |
Displays the player's region underneath their tag.
Admin functionality now allows admins to see other regions as read-only. If the admin is a super admin, they are allowed to select them. Added some additional css styling to make read-only look different.