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 Develop - V1.0.0 #115

Merged
merged 198 commits into from
Jan 11, 2021
Merged

Merge Develop - V1.0.0 #115

merged 198 commits into from
Jan 11, 2021

Commits on Aug 13, 2020

  1. notifications models within profiles app

    @mikemaddem
    mikemaddem committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    716f323 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. notifications list template initial commit

    @mikemaddem
    mikemaddem committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    5d3bf3b View commit details
    Browse the repository at this point in the history

  2. Working notification system with marking as read and unread

    @mikemaddem
    mikemaddem committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    c35dab0 View commit details
    Browse the repository at this point in the history

  3. bump version

    @mikemaddem
    mikemaddem committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    07844cf View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2020

  1. match stats models

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    8b24841 View commit details
    Browse the repository at this point in the history

  2. include migrations

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    3166866 View commit details
    Browse the repository at this point in the history

  3. dont create a teaminvite when creating a team

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    97bb47f View commit details
    Browse the repository at this point in the history

  4. attempt to send a notification to the receiving user about invite

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    ab128c3 View commit details
    Browse the repository at this point in the history

  5. fix hard coded links

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    064b475 View commit details
    Browse the repository at this point in the history

  6. remove captain membership, modify captain and player mtm field

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    f79f221 View commit details
    Browse the repository at this point in the history

  7. import notification, and switch queries to Q

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    126bfb4 View commit details
    Browse the repository at this point in the history

  8. had to manually modify, fixed now

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    e45813c View commit details
    Browse the repository at this point in the history

  9. TODO: change captain to account for multiple captains

    @mikemaddem
    mikemaddem committed Aug 22, 2020
    Configuration menu
    Copy the full SHA
    b00bf59 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. remove comment

    @mikemaddem
    mikemaddem committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    8ba9dea View commit details
    Browse the repository at this point in the history

  2. pep8

    @mikemaddem
    mikemaddem committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    74679f9 View commit details
    Browse the repository at this point in the history

  3. rewrite team create and team leave

    @mikemaddem
    mikemaddem committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    188e971 View commit details
    Browse the repository at this point in the history

  4. simplify teaminvite model, make captain a simple bool field

    @mikemaddem
    mikemaddem committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    5d5d26d View commit details
    Browse the repository at this point in the history

  5. migrations for models changes

    @mikemaddem
    mikemaddem committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    c989daa View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. show all captains on team detail page in staff and front end

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    266ce2e View commit details
    Browse the repository at this point in the history

  2. update team invite list template

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    a8c7164 View commit details
    Browse the repository at this point in the history

  3. update team forms to not use teaminvite objects

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    e6754f8 View commit details
    Browse the repository at this point in the history

  4. pass captains to staff team detail template

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    a5585a3 View commit details
    Browse the repository at this point in the history

  5. pass captains to team detail template

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    6d31f14 View commit details
    Browse the repository at this point in the history

  6. remove lots of teaminvite object usage - simplify

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    e8e1c68 View commit details
    Browse the repository at this point in the history

  7. rewrite team create report to not use teaminvite objects

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    a9b41a1 View commit details
    Browse the repository at this point in the history

  8. further work on removing teaminvite objects

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    0cf1c2b View commit details
    Browse the repository at this point in the history

  9. update match list to not use teaminvites

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    0592d0a View commit details
    Browse the repository at this point in the history

  10. fix myteam list and edit team permissions

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    30ee812 View commit details
    Browse the repository at this point in the history

  11. Revert "dont create a teaminvite when creating a team" 

    This reverts commit 97bb47f.
    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    ef0c053 View commit details
    Browse the repository at this point in the history

  12. Revert "Revert "dont create a teaminvite when creating a team"" 

    This reverts commit ef0c053.
    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    dd3efd6 View commit details
    Browse the repository at this point in the history

  13. requested changes

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    b55159d View commit details
    Browse the repository at this point in the history

  14. Merge pull request #105 from NFM-Studios/team-invite-new 

    Rewrite team invites - Closes #103
    @techlover1
    techlover1 committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    d5e854a View commit details
    Browse the repository at this point in the history

  15. add a pk1 field for specifying the object to redirect the user to

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    78af01c View commit details
    Browse the repository at this point in the history

  16. fix team list template

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    70fd8c1 View commit details
    Browse the repository at this point in the history

  17. remove test notification

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    34069b1 View commit details
    Browse the repository at this point in the history

  18. send the user to the specific object if the notification is aware

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    6d03958 View commit details
    Browse the repository at this point in the history

  19. notify users if a match gets disputed

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    36495f5 View commit details
    Browse the repository at this point in the history

  20. notify all users in list instead of the requesting user

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    9ddbf7f View commit details
    Browse the repository at this point in the history

  21. allow staff to force dispute a match

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    d2f1c5c View commit details
    Browse the repository at this point in the history

  22. fix notification add error

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    ebff51e View commit details
    Browse the repository at this point in the history

  23. idiot

    @mikemaddem
    mikemaddem committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    b27e06d View commit details
    Browse the repository at this point in the history

  24. fixed #104 and added teams to admin page

    @cmr6689
    cmr6689 committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    b45775d View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. fixed #104 in matches

    @cmr6689
    cmr6689 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    864e878 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #101 from NFM-Studios/notifications 

    Notifications - closes #21
    @mikemaddem
    mikemaddem committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    6803dff View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. add steam64 and discord field, closes #106

    @mikemaddem
    mikemaddem committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    358518d View commit details
    Browse the repository at this point in the history

  2. update changelog

    @mikemaddem
    mikemaddem committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    63c0b57 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. fix error on staff team detail page

    @mikemaddem
    mikemaddem committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    67fea9f View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. begin adding FA model to leagues models

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    22154da View commit details
    Browse the repository at this point in the history

  2. sort teams by points in division detail view

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    2f0ef71 View commit details
    Browse the repository at this point in the history

  3. Show division standings in division detail template

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    3e2a4c9 View commit details
    Browse the repository at this point in the history

  4. fix typo in staff:league division detail template

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    e29db65 View commit details
    Browse the repository at this point in the history

  5. add TODO for #107, add league matches list in staff view and template

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    ce1db6c View commit details
    Browse the repository at this point in the history

  6. add league settings detail template

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    5c83a5c View commit details
    Browse the repository at this point in the history

  7. front end league teams template for standings

    @mikemaddem
    mikemaddem committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    296de66 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. match checkin templates initial commit

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    6204f0c View commit details
    Browse the repository at this point in the history

  2. staff match checkin list template 

    show all match checkins for a specific match.
    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    9d3b434 View commit details
    Browse the repository at this point in the history

  3. match checkin form information - temp 

    todo: fix queryset for the players field so it grabs all players from the specific team
    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    9ad8f81 View commit details
    Browse the repository at this point in the history

  4. match checkin template for front end, redirect user to one of two pages

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    4cef36a View commit details
    Browse the repository at this point in the history

  5. team specific checkin template, output form from match.views

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    1994006 View commit details
    Browse the repository at this point in the history

  6. start work on some match stats, add matchchekin staff logic

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    8e066c6 View commit details
    Browse the repository at this point in the history

  7. urls for staff match checkin views

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    ea28d7c View commit details
    Browse the repository at this point in the history

  8. add matchcheckin models, and more match stats models

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    1d2959e View commit details
    Browse the repository at this point in the history

  9. fixed invalid field name on match.disable_userreport

    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    4dbc824 View commit details
    Browse the repository at this point in the history

  10. league detail show matches if only 1 division 

    stub out join league view function
    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    aa66edb View commit details
    Browse the repository at this point in the history

  11. stub out create match config function for get5. 

    upload example get5 config soon
    @mikemaddem
    mikemaddem committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    9b39b28 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. reset all migrations

    @mikemaddem
    mikemaddem committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    cdc2422 View commit details
    Browse the repository at this point in the history

  2. reset migrations again

    @mikemaddem
    mikemaddem committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    fd31401 View commit details
    Browse the repository at this point in the history

  3. update from stash

    @mikemaddem
    mikemaddem committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    65ccee1 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. temp remove staff tests

    @mikemaddem
    mikemaddem committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    f304b49 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2020

  1. pep8

    @mikemaddem
    mikemaddem committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    8eeebba View commit details
    Browse the repository at this point in the history

  2. teams add matches and team_stat - closes #109

    @mikemaddem
    mikemaddem committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    d7a288f View commit details
    Browse the repository at this point in the history

  3. remove tests in news - temp

    @mikemaddem
    mikemaddem committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    54bf880 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. add mtm in userprofiles to track team membership

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    c72f28f View commit details
    Browse the repository at this point in the history

  2. add bare try except for sending emails in testing env's - fix urls

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    716a619 View commit details
    Browse the repository at this point in the history

  3. pep8

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    ac67ad3 View commit details
    Browse the repository at this point in the history

  4. team views modification to fit with profile teams mtm fields

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    f6c2c93 View commit details
    Browse the repository at this point in the history

  5. more accurately show the invite form to the user

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    c8fb8a0 View commit details
    Browse the repository at this point in the history

  6. use object q for queries in team views

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    22d08bc View commit details
    Browse the repository at this point in the history

  7. shift team list view away from class based view

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    07dd066 View commit details
    Browse the repository at this point in the history

  8. remove captain membership from teams models - use profile mtm fields now

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    24bafb7 View commit details
    Browse the repository at this point in the history

  9. rework team_list template to be more detailed and work off new views

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    e672a2d View commit details
    Browse the repository at this point in the history

  10. add allow fa field to leagues - fix pr conflicts

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    b89ed70 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into match-stats

    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    94a3228 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #111 from NFM-Studios/match-stats 

    Merge match stats
    @mikemaddem
    mikemaddem committed Dec 2, 2020
    Configuration menu
    Copy the full SHA
    51d85d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2020

  1. Create Jenkinsfile

    @techlover1
    techlover1 committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    e10b22b View commit details
    Browse the repository at this point in the history

  2. Update Jenkinsfile 

    double quotes
    @techlover1
    techlover1 committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    1b690de View commit details
    Browse the repository at this point in the history

  3. Webhooks are fun

    @techlover1
    techlover1 committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    2d6076d View commit details
    Browse the repository at this point in the history

  4. Try the right(?) syntax

    @techlover1
    techlover1 committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    1d5269d View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2020

  1. Add more info to jenkins discord notification

    @techlover1
    techlover1 committed Dec 5, 2020
    Configuration menu
    Copy the full SHA
    5041bf3 View commit details
    Browse the repository at this point in the history

  2. Try putting this in a script step

    @techlover1
    techlover1 committed Dec 5, 2020
    Configuration menu
    Copy the full SHA
    30fe15d View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2020

  1. Different env var format

    @techlover1
    techlover1 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    6077740 View commit details
    Browse the repository at this point in the history

  2. Try GIT_LOCAL_BRANCH

    @techlover1
    techlover1 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    fd543c9 View commit details
    Browse the repository at this point in the history

  3. msg > env.msg

    @techlover1
    techlover1 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    ef38be5 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. run a script from google to fix migrations

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    b33bcff View commit details
    Browse the repository at this point in the history

  2. remove todo in match.models

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    fa0c016 View commit details
    Browse the repository at this point in the history

  3. pass map pool to tournaments matches when created

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    b02f23e View commit details
    Browse the repository at this point in the history

  4. rewrite bracket generation, remove hard coded team sizes

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    65f1c8c View commit details
    Browse the repository at this point in the history

  5. fix comparison warnings

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    7e647ce View commit details
    Browse the repository at this point in the history

  6. rename bracket4 to bracket, single template for all tournament brackets

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    93e51cb View commit details
    Browse the repository at this point in the history

  7. call .all() not manyrelatedmanager

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    1507d0f View commit details
    Browse the repository at this point in the history

  8. tweak and remove old views for non hard coded based sizes

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    d6b97e3 View commit details
    Browse the repository at this point in the history

  9. dont hard code round generation when launching tournament

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    c1ee2b4 View commit details
    Browse the repository at this point in the history

  10. remove old code from tournament views

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    f8f8076 View commit details
    Browse the repository at this point in the history

  11. update changelog and version #

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    f2e1d40 View commit details
    Browse the repository at this point in the history

  12. prevent small chance of picking the same team twice

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    1c0733f View commit details
    Browse the repository at this point in the history

  13. tweak maps field on matches

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    f0c81a8 View commit details
    Browse the repository at this point in the history

  14. staff view to randomly pick maps based on bestof

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    a1cc07c View commit details
    Browse the repository at this point in the history

  15. staff match templates to redirect staff to generate all maps, show maps

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    364853c View commit details
    Browse the repository at this point in the history

  16. modify bestof in match.settings

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    8ec2031 View commit details
    Browse the repository at this point in the history

  17. change default bestof per new options

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    f743538 View commit details
    Browse the repository at this point in the history

  18. migrations per new default values

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    38184ed View commit details
    Browse the repository at this point in the history

  19. logic to show map info on tournament detail template

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    ceddc87 View commit details
    Browse the repository at this point in the history

  20. fix team errors from previous versions

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    325ace5 View commit details
    Browse the repository at this point in the history

  21. allow modifying a matches bestof

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    d52d6ac View commit details
    Browse the repository at this point in the history

  22. fix match filtering in staff match list

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    636ae83 View commit details
    Browse the repository at this point in the history

  23. tweak and fix map choice logic

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    ec83c16 View commit details
    Browse the repository at this point in the history

  24. remove old tournament round link

    @mikemaddem
    mikemaddem committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    8fb2a64 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. rework bracket advance logic

    @mikemaddem
    mikemaddem committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    c323e50 View commit details
    Browse the repository at this point in the history

  2. better error checking and handling on tournament advance

    @mikemaddem
    mikemaddem committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    bbc475c View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. Allow founder_teams, captain_teams, and player_teams to be blank

    @techlover1
    techlover1 committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    aa6c0a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Fix images on singletournament detail

    @techlover1
    techlover1 committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    480428e View commit details
    Browse the repository at this point in the history

  2. Move singletournament rules from a separate page to detail

    @techlover1
    techlover1 committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    9ecaf62 View commit details
    Browse the repository at this point in the history

  3. teamcheckin form progress

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    8ecdea5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into develop

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    fc9c18c View commit details
    Browse the repository at this point in the history

  5. rewrite tournament join based on new team memberships

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    fedeb1e View commit details
    Browse the repository at this point in the history

  6. tweak tournament leave for new team membership and pep8 in bracket view

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    57ca372 View commit details
    Browse the repository at this point in the history

  7. fix teamcheckin issues

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    8a59d15 View commit details
    Browse the repository at this point in the history

  8. fix manyrelatedmanager issues in tournament views

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    1fff82c View commit details
    Browse the repository at this point in the history

  9. fix manyrelatedobject issues with match list

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    0b58219 View commit details
    Browse the repository at this point in the history

  10. fix model name issues

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    e6384ec View commit details
    Browse the repository at this point in the history

  11. pep8 allow blank=True for more fields

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    3a39890 View commit details
    Browse the repository at this point in the history

  12. match checkin process improvements and fixes

    @mikemaddem
    mikemaddem committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    8ab2019 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. Set branch name var and attempt adding author to commit

    @techlover1
    techlover1 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    3d20750 View commit details
    Browse the repository at this point in the history

  2. This is case sensitive

    @techlover1
    techlover1 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    b96e098 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. syntax fix

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    32075b0 View commit details
    Browse the repository at this point in the history

  2. fix queryset for tournament join form

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    4324e81 View commit details
    Browse the repository at this point in the history

  3. allow staff to force add players to teams

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    e8457a3 View commit details
    Browse the repository at this point in the history

  4. fix staff player remove - no more teaminvites

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    df465e6 View commit details
    Browse the repository at this point in the history

  5. route for staff:addplayer

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    0b601b1 View commit details
    Browse the repository at this point in the history

  6. staff:teamdetail pep8 and addplayer button

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    894390e View commit details
    Browse the repository at this point in the history

  7. fix remove player form, and add teamforceadduser form

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    f32e0e6 View commit details
    Browse the repository at this point in the history

  8. pass current utc.datetime to staff templates for simplicity

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    b177afd View commit details
    Browse the repository at this point in the history

  9. pass utc time staff league list

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    07aef34 View commit details
    Browse the repository at this point in the history

  10. pass datetime to tournament staff templates

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    41632e8 View commit details
    Browse the repository at this point in the history

  11. fix front end user remove

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    9a2fdbe View commit details
    Browse the repository at this point in the history

  12. fix team edit view

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    fc44233 View commit details
    Browse the repository at this point in the history

  13. show country flag as url instead of default image

    @mikemaddem
    mikemaddem committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    eb28a03 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2020

  1. Remove travis.yml

    @techlover1
    techlover1 committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    8015c22 View commit details
    Browse the repository at this point in the history

  2. Push master to docker hub if build succeeds

    @techlover1
    techlover1 committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    7d79b53 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #114 from NFM-Studios/jenkins 

    Migrate from TravisCI to Jenkins. Closes #112
    @techlover1
    techlover1 committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    554dcc6 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2020

  1. teamcheckin form get works, post having blank queryset issues and inv… 

    …alid
    @mikemaddem
    mikemaddem committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    67e8d92 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2021

  1. add config generated boolean to matches models

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    be2152d View commit details
    Browse the repository at this point in the history

  2. show generated config if generated on staff match detail

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    fd2f2e3 View commit details
    Browse the repository at this point in the history

  3. add generate config staff url

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    bd507ba View commit details
    Browse the repository at this point in the history

  4. begin work on get5 match config

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    c4efc18 View commit details
    Browse the repository at this point in the history

  5. add team tag field

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    994455c View commit details
    Browse the repository at this point in the history

  6. add team tag to team edit

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    24a0abd View commit details
    Browse the repository at this point in the history

  7. add alternate name to userprofiles

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    c3dd423 View commit details
    Browse the repository at this point in the history

  8. staff match detail template improvements

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    840a2a4 View commit details
    Browse the repository at this point in the history

  9. add server and datetime information for matches.

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    800c3e4 View commit details
    Browse the repository at this point in the history

  10. more progress on auto generating match configs

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    563bbae View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into develop

    @mikemaddem
    mikemaddem committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    04febf7 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2021

  1. Missing }

    @techlover1
    techlover1 committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    9be525d View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. match checkin form debug @techlover1

    @mikemaddem
    mikemaddem committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    48e3a66 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. template spelling

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    0bdb878 View commit details
    Browse the repository at this point in the history

  2. Complete team checkin

    @techlover1
    techlover1 committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    5ea4446 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into develop

    @techlover1
    techlover1 committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    461c89a View commit details
    Browse the repository at this point in the history

  4. Fix error message string

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    9605469 View commit details
    Browse the repository at this point in the history

  5. fix codacy issues

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    0e2a4e9 View commit details
    Browse the repository at this point in the history

  6. re add news tests

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    71dc4ed View commit details
    Browse the repository at this point in the history

  7. fix tests

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    9bf51e8 View commit details
    Browse the repository at this point in the history

  8. readd staff tests

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    04c62e3 View commit details
    Browse the repository at this point in the history

  9. 6 test cases for team functionality and team detail view

    @mikemaddem
    mikemaddem committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    4c178b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. Remove unused imports and refactor 'map' variable

    @techlover1
    techlover1 committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    f146af7 View commit details
    Browse the repository at this point in the history

  2. add additional links in navbar

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    a1942c6 View commit details
    Browse the repository at this point in the history

  3. fix detail league 500

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    faa310a View commit details
    Browse the repository at this point in the history

  4. improved error message styling

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    a579a69 View commit details
    Browse the repository at this point in the history

  5. add warning and success message styling

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    dee4a64 View commit details
    Browse the repository at this point in the history

  6. pep8

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    423ec9b View commit details
    Browse the repository at this point in the history

  7. register other match objects to admin panel

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    e97f93d View commit details
    Browse the repository at this point in the history

  8. remove duplicate message tags

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    5548500 View commit details
    Browse the repository at this point in the history

  9. use site name in header

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    cbc198d View commit details
    Browse the repository at this point in the history

  10. improve base.html styling

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    e4e6bc4 View commit details
    Browse the repository at this point in the history

  11. improve ruleset detail template on front page

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    b986638 View commit details
    Browse the repository at this point in the history

  12. fix league join redirect

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    f440b91 View commit details
    Browse the repository at this point in the history

  13. fix league detail rules view

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    666ed3b View commit details
    Browse the repository at this point in the history

  14. remove debug print

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    e8060b6 View commit details
    Browse the repository at this point in the history

  15. fix 404 static files

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    f1f75c6 View commit details
    Browse the repository at this point in the history

  16. fix league teams view and template

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    83216c0 View commit details
    Browse the repository at this point in the history

  17. template fix and pep8

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    ef0c206 View commit details
    Browse the repository at this point in the history

  18. store list template improvements

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    21a794b View commit details
    Browse the repository at this point in the history

  19. add models to admin panel

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    348f802 View commit details
    Browse the repository at this point in the history

  20. pep8 and add link to staff:match detail on staff league div detail

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    687f247 View commit details
    Browse the repository at this point in the history

  21. fix staff template location

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    78e9662 View commit details
    Browse the repository at this point in the history

  22. work on #107 #113

    @mikemaddem
    mikemaddem committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    b48be9f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. disable deprecated features (store and wagers) based on env var

    @techlover1
    techlover1 committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    71c5cf1 View commit details
    Browse the repository at this point in the history

  2. Fix error with paypal email

    @techlover1
    techlover1 committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    e092999 View commit details
    Browse the repository at this point in the history

  3. Remove a settings file that is no longer used

    @techlover1
    techlover1 committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    a591686 View commit details
    Browse the repository at this point in the history