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

More misc tweaks/fixes #380

Merged
merged 13 commits into from
Sep 14, 2022
Merged

More misc tweaks/fixes #380

merged 13 commits into from
Sep 14, 2022

Conversation

itinerare
Copy link
Collaborator

@itinerare itinerare commented Aug 30, 2022 •
edited

Primarily:

  • Add a visibility toggle to traits
  • Fix an exploit allowing users to purchase currency with another user's character's owned currency

Tested locally, requires migrate.

itinerare and others added 12 commits August 8, 2022 14:49
@itinerare @github-actions
refactor: fix PHP styling
763ba72
@itinerare
feat(features): add visibility toggle
bb397c8 
- hidden features are not shown in world list, search, or when selecting on design updates
- they are still shown when creating a character or updating an existing character's traits, however
@itinerare
Merge branch 'feature/trait-visibility'
8a9f089 
Conflicts:
	app/Http/Controllers/BrowseController.php
	app/Http/Controllers/Characters/DesignController.php
@itinerare
feat(features): add visibility support to organized dropdowns
8c0b515
@itinerare
Merge branch 'develop' into fork-main
2433944
@itinerare
Merge branch 'extension/organised_trait_dropdown'
107a317 
Conflicts:
	app/Http/Controllers/Admin/Characters/CharacterController.php
	app/Http/Controllers/Admin/Characters/CharacterImageController.php
	app/Http/Controllers/Admin/Data/FeatureController.php
	app/Http/Controllers/BrowseController.php
	app/Http/Controllers/Characters/DesignController.php
	app/Http/Controllers/WorldController.php
	app/Models/Feature/Feature.php
	app/Services/FeatureService.php
	resources/views/admin/features/create_edit_feature.blade.php
@itinerare
fix(features): hidden features still shown when organized dropdown is…
d8148f4 
… disabled
@itinerare @github-actions
refactor: fix blade formatting
98ed786
@itinerare
fix(features): tooltip verbiage on create/edit view
e43ffaa
@itinerare
fix(features): hidden features shown in species trait index
e56b378
@itinerare
Merge branch 'extension/organised_trait_dropdown' into fork-main
fbc1197
@itinerare
fix(shops): check that user owns character with currency used for pur…
d8e3ef5 
…chase
@itinerare itinerare added enhancement New feature or request needs review Pull requests that are pending community review labels Aug 30, 2022
@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 Sep 14, 2022
@itinerare itinerare merged commit 9aec791 into corowne:develop Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SpeedyD SpeedyD SpeedyD approved these changes

@preimpression preimpression preimpression approved these changes

@Draginraptor Draginraptor Awaiting requested review from Draginraptor

Assignees
No one assigned
Labels
enhancement New feature or request reviewed Pull requests that have received community review and are pending merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@itinerare @SpeedyD @preimpression