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.

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

Release/1.4.0 #385

Merged
merged 150 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
d668a3d
Adding basic feat and race models.
invalid-email-address Aug 12, 2023
59ff066
Whitepace and verbose name edits.
invalid-email-address Aug 12, 2023
710f7d1
Renaming for clarity
invalid-email-address Aug 13, 2023
faed207
Adding feat and race to the endpoints
invalid-email-address Aug 13, 2023
2ac6f28
Exposing Races
invalid-email-address Aug 13, 2023
dd6b3e2
Exposing the model admin correctly.
invalid-email-address Aug 13, 2023
ac33dd0
exposing traits.
invalid-email-address Aug 13, 2023
fc62054
fixing is_subrace boolean.
invalid-email-address Aug 13, 2023
845b63e
Whitespace and documentation.
invalid-email-address Aug 13, 2023
58dfa7f
Adding in race data.
invalid-email-address Aug 13, 2023
552fd0f
Adding Tome of heroes Races.
invalid-email-address Aug 14, 2023
76d1994
Adding srd feat.
invalid-email-address Aug 14, 2023
9cff5b7
Adding a5e feats.
invalid-email-address Aug 15, 2023
c7251b4
Need to add the ruleset manually.
invalid-email-address Aug 15, 2023
fb26813
Making Trait use generic Benefit.
invalid-email-address Aug 16, 2023
446c443
Changed races over to an abstract.
invalid-email-address Aug 16, 2023
8d7b459
Adds selectable bool.
invalid-email-address Aug 16, 2023
81eee49
didn't need this in a separate file.
invalid-email-address Aug 17, 2023
a12f7bc
Renaming prerequisite_desc to prerequisite.
invalid-email-address Aug 17, 2023
5fd120a
Adding has_prerequisite property.
invalid-email-address Aug 17, 2023
a64c3a0
Adding a couple of utility fields to feats.
invalid-email-address Aug 17, 2023
401f5c4
adjustments to feats model.
invalid-email-address Aug 18, 2023
063d0ef
Adding Backgrounds.
invalid-email-address Sep 17, 2023
7fd0612
Bugfix on feat
invalid-email-address Sep 17, 2023
d6fdf3d
Stubbing out languages.
invalid-email-address Sep 17, 2023
3c370db
Adjusting exports.
invalid-email-address Sep 17, 2023
af158c9
exposing backgrounds.
invalid-email-address Sep 17, 2023
966ac03
Full ruleset file required.
invalid-email-address Sep 17, 2023
33382dc
Adding in some of the toh backgrounds.
invalid-email-address Sep 18, 2023
6b9b0a9
Disabled Prettier
Oct 2, 2023
12c9b15
Merge remote-tracking branch 'origin/staging' into api_v2_backgrounds
invalid-email-address Oct 3, 2023
84ab6ad
removing special fields from background.
invalid-email-address Oct 3, 2023
b9f6eef
Tidying up docstrings.
invalid-email-address Oct 3, 2023
bd8a388
Adjusting export and putting new struct in.
invalid-email-address Oct 4, 2023
9b0f757
Tracking down a bug related to ruleset export.
invalid-email-address Oct 4, 2023
b12a040
Need to skip ruleset and background from loop.
invalid-email-address Oct 5, 2023
b38edfa
Skipping publisher too.
invalid-email-address Oct 5, 2023
37809f5
Removing print statements.
invalid-email-address Oct 5, 2023
e7a7852
Clarifying benefit types.
invalid-email-address Oct 5, 2023
e729999
Typo on language
invalid-email-address Oct 6, 2023
2e28188
Adding in toh backgrounds.
invalid-email-address Oct 6, 2023
93614af
Adding features that worked.
invalid-email-address Oct 6, 2023
f72ffb3
Adjusting feature logic.
invalid-email-address Oct 6, 2023
5d6ee7c
More features that worked.
invalid-email-address Oct 6, 2023
0308ba4
Adding all backgrounds.
invalid-email-address Oct 6, 2023
1577c84
Adding migration and renaming publisher.
invalid-email-address Oct 6, 2023
429220e
Merge branch 'staging' into api_v2_backgrounds
invalid-email-address Oct 25, 2023
14cfb05
Merge branch 'staging' into api_v2_backgrounds
augustjohnson Oct 28, 2023
28c9e50
Refactor of creature.
invalid-email-address Oct 29, 2023
5e009ad
rename field
invalid-email-address Oct 29, 2023
46c5af1
Fixing export.
invalid-email-address Oct 29, 2023
64ee133
Adjusting type
invalid-email-address Oct 29, 2023
76284ab
Adding new models.
invalid-email-address Oct 29, 2023
1011b9c
Removing deprecated fields.
invalid-email-address Oct 29, 2023
1b36df7
Adding creaturetypes to database.
invalid-email-address Oct 29, 2023
aab42f8
Exposing creaturetype to the API
invalid-email-address Oct 29, 2023
d313494
Creatures now use creature type key.
invalid-email-address Nov 4, 2023
7a80aac
Merge branch 'api_v2_backgrounds' into release/1.4.0
invalid-email-address Nov 4, 2023
9526e51
Merging migrations
invalid-email-address Nov 4, 2023
934fafb
Basic views into it's own folder.
invalid-email-address Nov 4, 2023
714f1f3
Fixing a bug with a plant.
invalid-email-address Nov 4, 2023
945fdc9
splitting serializers into a folder.
invalid-email-address Nov 4, 2023
63301cf
Items and backgrounds split out.
invalid-email-address Nov 4, 2023
86ce490
Adding back in import.
invalid-email-address Nov 4, 2023
7bfd417
Adding in another import.
invalid-email-address Nov 4, 2023
7e3c205
Fixing backgrounds.
invalid-email-address Nov 4, 2023
b1f741e
Adjusting additional serializers.
invalid-email-address Nov 4, 2023
a71b7f7
Fixing an import.
invalid-email-address Nov 4, 2023
42e4f41
Bringing creaturetype out.
invalid-email-address Nov 4, 2023
e2ae295
Backgrounds working.
invalid-email-address Nov 4, 2023
bf03d2c
Splitting Documents.
invalid-email-address Nov 4, 2023
1f3fa97
Getting items back online.
invalid-email-address Nov 4, 2023
e613940
Races and Feats.
invalid-email-address Nov 4, 2023
91d3211
Removing single views.
invalid-email-address Nov 4, 2023
d989832
Whitespace issue.
invalid-email-address Nov 4, 2023
752f76b
Merge pull request #366 from open5e/v2_split_views_and_serializers
augustjohnson Nov 4, 2023
3b2b17e
Adding basic damage type model.
invalid-email-address Nov 4, 2023
a040ce3
renaming for ease
invalid-email-address Nov 4, 2023
4d1b1d5
Adding into inits.
invalid-email-address Nov 4, 2023
1cb71ee
Adding into views, urls and tables.
invalid-email-address Nov 4, 2023
22613c4
Fixing admin to add Damage Type.
invalid-email-address Nov 4, 2023
00e51bc
Adding damage type data.
invalid-email-address Nov 4, 2023
ba2a199
Fields are reodered now.
invalid-email-address Nov 4, 2023
dd5f520
Adding language model and to the admin
invalid-email-address Nov 4, 2023
1f49909
Allowing for blank script for unwritten languages.
invalid-email-address Nov 4, 2023
750e5c1
Adding in language serializer.
invalid-email-address Nov 4, 2023
cbc9777
Exposing and adding filters to language.
invalid-email-address Nov 4, 2023
74e21fd
Merge pull request #367 from open5e/v2_languages
augustjohnson Nov 4, 2023
40ffeb0
Fixing some unused imports.
invalid-email-address Nov 4, 2023
f61cc75
Creating alignment model.
invalid-email-address Nov 4, 2023
4859e8c
Exposing alignments.
invalid-email-address Nov 4, 2023
764fd6c
Adding some properties and filters.
invalid-email-address Nov 4, 2023
db81a29
Adding languages and alignment.
invalid-email-address Nov 4, 2023
4000028
Merge pull request #368 from open5e/v2_alignment
augustjohnson Nov 4, 2023
9400490
Adding conditions in.
invalid-email-address Nov 4, 2023
3e5014b
Condition data.
invalid-email-address Nov 4, 2023
530243e
Exposing conditions.
invalid-email-address Nov 4, 2023
c67845b
Merge pull request #369 from open5e/v2_conditions
augustjohnson Nov 4, 2023
930060a
Adding a proposed document stats endpoint.
invalid-email-address Nov 4, 2023
b2c6b38
Merge pull request #370 from open5e/v2_document_stats
augustjohnson Nov 4, 2023
21b3120
Returning races in a hierarchy
invalid-email-address Nov 4, 2023
cb493fb
Allowing for subrace_of__isnull.
invalid-email-address Nov 4, 2023
157ad5e
Merge pull request #371 from open5e/v2_better_race_view
augustjohnson Nov 4, 2023
966d738
Stable item category.
invalid-email-address Nov 5, 2023
c6c25a4
Data.
invalid-email-address Nov 5, 2023
65045c4
Fields should be in the right spot.
invalid-email-address Nov 5, 2023
0daa6b5
Lining up categories
invalid-email-address Nov 5, 2023
0a74d27
This is bad performance, but it works.
invalid-email-address Nov 5, 2023
1cee789
Merge pull request #372 from open5e/v2_item_category
augustjohnson Nov 5, 2023
49ae636
Export first round. Doesn't include monsters etc
invalid-email-address Nov 5, 2023
964ae40
Export is working!
invalid-email-address Nov 5, 2023
b44833c
Deleting the old jsons.
invalid-email-address Nov 5, 2023
3afbbea
Fixing import.
invalid-email-address Nov 5, 2023
8210b2f
Removing import.
invalid-email-address Nov 5, 2023
9485ef4
Importer is deprecated.
invalid-email-address Nov 5, 2023
87253af
Merge pull request #373 from open5e/v1_import_export_adjust
augustjohnson Nov 5, 2023
b262d6c
Refactor.
invalid-email-address Nov 6, 2023
8ced83e
Merge pull request #377 from open5e/refactor_benefit
augustjohnson Nov 7, 2023
1d15c5e
Merge commit 'refs/pull/330/head' into pr330
invalid-email-address Nov 7, 2023
b45603b
Adding in PR330
invalid-email-address Nov 7, 2023
90969c9
cleaning up old format.
invalid-email-address Nov 7, 2023
9915d6e
Merge pull request #379 from open5e/pr330
augustjohnson Nov 7, 2023
2a16892
Adding in version from PR334.
invalid-email-address Nov 7, 2023
f6b088e
Merge pull request #380 from open5e/pr334
augustjohnson Nov 7, 2023
c6fda05
Planes are in!
invalid-email-address Nov 7, 2023
407a82a
Fixing a refactor bug.
invalid-email-address Nov 7, 2023
dc86339
Adding in the rest of the plane additional info.
invalid-email-address Nov 7, 2023
4c0b093
Adding parent field.
invalid-email-address Nov 8, 2023
54e052a
Merge pull request #381 from open5e/pr339-2
augustjohnson Nov 8, 2023
07bc90c
Bugfix for export.
invalid-email-address Nov 8, 2023
68c72be
Adding blackflag content.
invalid-email-address Nov 8, 2023
cc64042
Renaming to skip input.
invalid-email-address Nov 8, 2023
f091c8d
Merge pull request #382 from open5e/pr357
augustjohnson Nov 8, 2023
04458f8
Removing the misty step.
invalid-email-address Nov 8, 2023
3e0e285
Merge pull request #383 from open5e/PR360
augustjohnson Nov 8, 2023
b559f53
Merge branch 'staging' into release/1.4.0
invalid-email-address Nov 8, 2023
64596b0
Adding an order
invalid-email-address Nov 10, 2023
885b63d
Approving ordered views.
invalid-email-address Nov 10, 2023
51e88fd
Adding some simple approved changes.
invalid-email-address Nov 11, 2023
3c64add
Impossible to compare like 1000 items. Approved.
invalid-email-address Nov 11, 2023
28ca5ea
Feats should be good.
invalid-email-address Nov 11, 2023
a5d1097
Commenting out unstable tests.
invalid-email-address Nov 11, 2023
76174ef
Merge pull request #386 from open5e/ordering_views
augustjohnson Nov 12, 2023
54dc38a
Fixing magicitems.
invalid-email-address Nov 17, 2023
76c9c35
Restoring deck of many things fix.
invalid-email-address Nov 17, 2023
0a87275
bringing magicitems tests up to speed.
invalid-email-address Nov 17, 2023
364a366
Merge pull request #388 from open5e/magicitems_fix
augustjohnson Nov 17, 2023
6d8ab67
Merge branch 'staging' into release/1.4.0
invalid-email-address Nov 17, 2023
3fd32c7
Adjusting approved magicitems.
invalid-email-address Nov 19, 2023
72e4b62
Commenting out unreliable tests.
invalid-email-address Nov 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
785 changes: 0 additions & 785 deletions api/management/commands/importer.py

This file was deleted.

180 changes: 0 additions & 180 deletions api/management/commands/populatedb.py

This file was deleted.

41 changes: 0 additions & 41 deletions api/management/commands/quickload.py

This file was deleted.

8 changes: 5 additions & 3 deletions api/management/commands/quicksetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
from django.core.management import call_command
from django.core.management.base import BaseCommand

from api.management.commands import quickload

class Command(BaseCommand):
"""Implementation for the `manage.py quicksetup` subcommand."""

Expand All @@ -28,7 +26,7 @@ def handle(self, *args, **options):
collect_static()

self.stdout.write('Populating the v1 database...')
quickload.populate_db()
import_v1()

self.stdout.write('Populating the v2 database...')
import_v2()
Expand All @@ -41,6 +39,10 @@ def handle(self, *args, **options):

self.stdout.write(self.style.SUCCESS('API setup complete.'))

def import_v1() -> None:
"""Import the v1 apps' database models."""
call_command('import', '--dir', 'data/v1')


def import_v2() -> None:
"""Import the v2 apps' database models."""
Expand Down
18 changes: 18 additions & 0 deletions api/migrations/0034_plane_parent.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.20 on 2023-11-07 21:20

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('api', '0033_monster_bonus_actions_json'),
]

operations = [
migrations.AddField(
model_name='plane',
name='parent',
field=models.TextField(null=True),
),
]
2 changes: 1 addition & 1 deletion api/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def plural_str() -> str:


class Plane(GameContent):
pass
parent = models.TextField(null=True)
route = models.TextField(default="planes/")

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class Meta:
class PlaneSerializer(DynamicFieldsHyperlinkedModelSerializer):
class Meta:
model = models.Plane
fields = ('slug','name','desc','document__slug', 'document__title', 'document__url')
fields = ('slug','name','desc','document__slug', 'document__title', 'document__url','parent')

class SectionSerializer(DynamicFieldsHyperlinkedModelSerializer):
class Meta:
Expand Down
Loading