-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #115 from NFM-Studios/develop
Merge Develop - V1.0.0
- Loading branch information
Showing
233 changed files
with
3,256 additions
and
4,948 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,4 +57,5 @@ pipeline { | |
''' | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
from django.contrib import admin | ||
from .models import League, LeagueDivision, LeagueTeam, LeagueSettings | ||
|
||
# Register your models here. | ||
admin.site.register(League) | ||
admin.site.register(LeagueDivision) | ||
admin.site.register(LeagueTeam) | ||
admin.site.register(LeagueSettings) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
# Generated by Django 2.2.15 on 2020-12-09 20:08 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
initial = True | ||
|
||
dependencies = [ | ||
('leagues', '0001_initial'), | ||
('matches', '0002_auto_20201209_1508'), | ||
('teams', '0001_initial'), | ||
('profiles', '0001_initial'), | ||
('singletournaments', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='leagueteam', | ||
name='team', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='league_team', to='teams.Team'), | ||
), | ||
migrations.AddField( | ||
model_name='leaguefreeagent', | ||
name='user', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fa_profile', to='profiles.UserProfile'), | ||
), | ||
migrations.AddField( | ||
model_name='leaguedivision', | ||
name='matches', | ||
field=models.ManyToManyField(blank=True, to='matches.Match'), | ||
), | ||
migrations.AddField( | ||
model_name='leaguedivision', | ||
name='teams', | ||
field=models.ManyToManyField(blank=True, to='leagues.LeagueTeam'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='divisions', | ||
field=models.ManyToManyField(blank=True, to='leagues.LeagueDivision'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='fa', | ||
field=models.ManyToManyField(blank=True, related_name='league_fas', to='leagues.LeagueFreeAgent'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='game', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='league_game', to='matches.GameChoice'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='maps', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='league_maps', to='matches.MapPoolChoice'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='platform', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='league_platform', to='matches.PlatformChoice'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='ruleset', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='league_ruleset', to='singletournaments.SingleTournamentRuleset'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='settings', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='league_settings', to='leagues.LeagueSettings'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='sport', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='league_sport', to='matches.SportChoice'), | ||
), | ||
migrations.AddField( | ||
model_name='league', | ||
name='teams', | ||
field=models.ManyToManyField(blank=True, to='leagues.LeagueTeam'), | ||
), | ||
] |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2.15 on 2020-12-09 22:21 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('leagues', '0002_auto_20201209_1508'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='league', | ||
name='bestof', | ||
field=models.SmallIntegerField(choices=[(1, 'Best of 1'), (2, 'Best of 2'), (3, 'Best of 3'), (4, 'Best of 4'), (5, 'Best of 5')], default=0), | ||
), | ||
] |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2.15 on 2020-12-09 22:29 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('leagues', '0003_auto_20201209_1721'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='league', | ||
name='bestof', | ||
field=models.SmallIntegerField(choices=[(1, 'Best of 1'), (2, 'Best of 2'), (3, 'Best of 3'), (4, 'Best of 4'), (5, 'Best of 5')], default=1), | ||
), | ||
] |
Oops, something went wrong.