Skip to content

Feat: Adds Admin "Edit" button#364

Merged
itinerare merged 8 commits into
lk-arpg:developfrom
preimpression:develop
Aug 18, 2022
Merged

Feat: Adds Admin "Edit" button#364
itinerare merged 8 commits into
lk-arpg:developfrom
preimpression:develop

Conversation

@preimpression
Copy link
Copy Markdown
Contributor

No description provided.

preimpression and others added 4 commits August 14, 2022 11:53
# Conflicts:
#	app/Models/Character/CharacterCategory.php
#	app/Models/Feature/Feature.php
#	app/Models/Feature/FeatureCategory.php
#	app/Models/Gallery/Gallery.php
#	app/Models/Item/ItemCategory.php
#	app/Models/News.php
#	app/Models/Prompt/PromptCategory.php
#	app/Models/Rarity.php
#	app/Models/Sales/Sales.php
#	app/Models/Shop/Shop.php
#	app/Models/Species/Species.php
#	app/Models/Species/Subtype.php
#	resources/views/galleries/gallery.blade.php
#	resources/views/pages/page.blade.php
#	resources/views/prompts/_entry.blade.php
#	resources/views/prompts/prompt_categories.blade.php
#	resources/views/raffles/index.blade.php
#	resources/views/raffles/ticket_index.blade.php
#	resources/views/shops/shop.blade.php
#	resources/views/world/_currency_entry.blade.php
#	resources/views/world/_entry.blade.php
#	resources/views/world/_item_category_entry.blade.php
#	resources/views/world/_item_entry.blade.php
#	resources/views/world/_rarity_entry.blade.php
#	resources/views/world/character_categories.blade.php
#	resources/views/world/feature_categories.blade.php
#	resources/views/world/item_page.blade.php
#	resources/views/world/prompt_categories.blade.php
#	resources/views/world/rarities.blade.php
Comment thread resources/views/raffles/ticket_index.blade.php
@itinerare itinerare added enhancement New feature or request reviewed Pull requests that have received community review and are pending merge needs review Pull requests that are pending community review and removed reviewed Pull requests that have received community review and are pending merge labels Aug 14, 2022
Copy link
Copy Markdown
Member

@itinerare itinerare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Broadly looks good and I like the implementation as a component!

Comment thread app/Models/Species/Subtype.php Outdated
@itinerare itinerare requested a review from Draginraptor August 14, 2022 18:39
@itinerare itinerare added reviewed Pull requests that have received community review and are pending merge and removed needs review Pull requests that are pending community review labels Aug 18, 2022
@itinerare itinerare merged commit 2df013a into lk-arpg:develop Aug 18, 2022
@itinerare itinerare removed the request for review from Draginraptor August 21, 2022 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request reviewed Pull requests that have received community review and are pending merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants