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

modified-main - Extension Additions #39

Merged
merged 73 commits into from Nov 15, 2020
Merged

modified-main - Extension Additions #39

merged 73 commits into from Nov 15, 2020

Conversation

itinerare
Copy link
Collaborator

@itinerare itinerare commented Nov 11, 2020 •
edited

  • Add two extensions by @JuniJwi -- masterlist sublists and MYO item tag-- on the basis of being both useful and functionally opt-in
  • Add several more extensions (by @itinerare, @JuniJwi) on an opt-in basis via a new config file. Please see the branch's readme for more information

Tested locally - Requires migration, add-site-settings

itinerare and others added 30 commits August 13, 2020 17:50
@itinerare
Add ability for staff with masterlist perms to vote on design updates…
4aaaa91 
…/MYO submissions. This does not automatically process them, only provide a tool for staff to communicate.
@itinerare
Merge remote-tracking branch 'hub/bootstrapTables' into design-update…
7df1199 
…-voting
@itinerare
Add display of votes to admin queue/index
7ac2471
@itinerare
Shuffle some
51d49c7
@itinerare
Change text checking to use design update type.
3130178
@JuniJwi
character Toyhouse profile button
b5db610
@itinerare
Build out visual trait index per species.
b5c6e58
@itinerare
Merge branch 'main' into species-trait-index
365e7d9
@JuniJwi
add bell icon to navbar
1d5975d
@JuniJwi
remove original news notif
2f46de6
@JuniJwi
add buttons for page badges
1095c3f
@JuniJwi
change div to relative for content
4d17be9
@JuniJwi
Merge branch 'main' of https://github.com/itinerare/lorekeeper into c…
5e81100 
…haracter-status-badges-mer
@JuniJwi
update badges for additional options for ART
1b8f7c5
@JuniJwi
add MYO Slot Item Tag code
ee15baa
@JuniJwi
remove unused features
09a2e5a
@JuniJwi
remove orrison customization!
d3eadff
@JuniJwi
check for blank name when making myo slot
32f37f3
@JuniJwi
Changing positioning to responsive bootstrap/flex, credit to uri!
f9d6fe4
@JuniJwi
Merge branch 'character-status-badges' of https://github.com/JuniJwi/…
8fcf225 
…lorekeeper into character-status-badges-merc

# Conflicts:
#	resources/views/character/character.blade.php
#	resources/views/character/myo/character.blade.php
#	resources/views/character/profile.blade.php
@JuniJwi
forgot to update an h1 set fo brackets
f0f5a4e
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper into n…
6169b2d 
…avbar-news-notif
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper into M…
bc47a07 
…YO-item-tag-stacks
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper
a4102bc
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper into c…
705b578 
…haracter-THprofile-buttons
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper into c…
3012e51 
…haracter-status-badges-merc
@JuniJwi
added infrastructure for sublist-- still working on browsecontroller...
731b6c3
@JuniJwi
add species back, finish browse filtering, add the ability to edit su…
2c220e8 
…b contents in sub options
@JuniJwi
fix sublist menu in profiles, fix sublist creation typos
e053195
@JuniJwi
add sorting
944c530
JuniJwi and others added 20 commits October 19, 2020 20:45
@JuniJwi
remove accidentally added avatar
40b2400
@JuniJwi
Merge branch 'master' of https://github.com/corowne/lorekeeper
7d91ead
@JuniJwi
Merge branch 'master' into character-status-badges-merc
337cdf7
@JuniJwi
Merge branch 'master' into character-THprofile-buttons
1c18f11
@JuniJwi
Merge branch 'master' into masterlist-sub
7df3968
@JuniJwi
Merge branch 'master' into MYO-item-tag-stacks
85adcea
@JuniJwi
Merge branch 'master' into navbar-news-notif
64615dc
@JuniJwi
Update sublist search to account for expanded gift art status courtes…
d1ab399 
…y of Mercury
@itinerare
Merge branch 'masterlist-sub' of https://github.com/JuniJwi/lorekeeper …
7803a89 
…into modified-main
@itinerare
Merge branch 'MYO-item-tag-stacks' of https://github.com/JuniJwi/lore…
88a3d59 
…keeper into modified-main
@itinerare
Add extension config file, begin modifying readme
c0b2b82
@itinerare
Merge branch 'modified-main' into modified-main-fork
b156196
@itinerare
Readme
a3b8e1d
@itinerare
Merge branch 'character-status-badges' of https://github.com/JuniJwi/…
8311f7c 
…lorekeeper into modified-main
@itinerare
Character status badges prelim implementation
78c6ade
@itinerare
Merge branch 'character-THprofile-buttons' of https://github.com/Juni…
3d84f79 
…Jwi/lorekeeper into modified-main
@itinerare
Merge branch 'navbar-news-notif' of https://github.com/JuniJwi/loreke…
988dbc0 
…eper into modified-main-fork
@itinerare
Merge branch 'species-trait-index' into modified-main-fork
3b15412
@itinerare
Merge branch 'design-update-voting' into modified-main-fork
969dbaf
@itinerare
- Further testing, formatting, and validation for opt-in extensions
77559a3 
- Readme
@itinerare itinerare added the needs review Pull requests that are pending community review label Nov 11, 2020
Ne-wt
Ne-wt approved these changes Nov 14, 2020
View reviewed changes
Copy link
Contributor

@Ne-wt Ne-wt left a comment

Choose a reason for hiding this comment

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

Pulled and tested on local - all additions work correctly and welcomed changes added✨

@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 Nov 15, 2020
@itinerare itinerare merged commit fe02bd6 into corowne:modified-main Nov 15, 2020
@itinerare itinerare deleted the modified-main-fork branch November 15, 2020 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Draginraptor Draginraptor Draginraptor approved these changes

@Ne-wt Ne-wt Ne-wt approved these changes

Assignees
No one assigned
Labels
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
4 participants
@itinerare @Draginraptor @Ne-wt @JuniJwi