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

Merge modified-main into core #42

Merged
merged 403 commits into from
Nov 16, 2020
Merged

Merge modified-main into core #42

merged 403 commits into from
Nov 16, 2020

Conversation

itinerare
Copy link
Collaborator

New:

Bugs Fixed:

itinerare and others added 30 commits August 24, 2020 19:36
@itinerare
Add site settings, default watermark image, and (hopefully) processing
ce3e1c3
@itinerare
Merge branch 'main' into watermarking
6bb7937
@itinerare
Image processing, thumbnail generation, etc work now
924f791
@itinerare
Further offset checking on thumbnail generation
dd36c24
@itinerare
Minor tidying.
1975b00
@itinerare
Add site setting to process thumbnails or use default behavior.
4758982
@itinerare
Move configuration to config file
5490975
@itinerare
Merge branch 'watermarking' of ../site_hub into watermarking
40fb345
@itinerare
Move configs to config file instead of site settings, add optional fi…
dbc0fba 
…letype encoding
@itinerare
Fully implement saving as different filetypes.
10f3159
@itinerare
Put back some stray code
a5b0289
@itinerare
;
65a4211
@itinerare
Properly refer to masterlist perms
304b994
@ScuffedNewt
fix i forgot lol
cd32ec6
@ScuffedNewt
no message
b700612
@itinerare
Disable image processing on MYO slot images
d5fc08f
@itinerare
;
75a8811
@itinerare
Clarify wording around masterlist image format setting
9c1900e
@JuniJwi
character Toyhouse profile button
b5db610
@itinerare
Fix for error viewing masterlist entries
6c9898c
@ryannicmyk
Added daily clean up scedule for cleaning .tmp files from gif upload
9dd28c3
@ryannicmyk
Added auto tmp cleanup to laravel schedules
1fdf29d 
Updated gitignore to ignote user avatars image folder (same reason as all the other images being gitignored)
@ScuffedNewt
Merge pull request #2 from snupsplus/user-icon-addon
bc124e1 
User icon addon
@ScuffedNewt
fixing warning
df1e79c
@itinerare
Fix for bug with design update staff ID being set to design update us…
ab929d9 
…er's ID
@itinerare
Put back ? user currency handling?
7432646
@itinerare
Should be a cleaner fix for user/staff ID mixup
ee63210
@itinerare
Build out visual trait index per species.
b5c6e58
@itinerare
Merge branch 'main' into watermarking
f1076c3
@itinerare
Fix error when viewing inv stack modal as guest
3871567
itinerare and others added 22 commits November 11, 2020 10:40
@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
Move reports to own section in home sidebar
98e6dd6
@itinerare
Fix divide by zero error in raffle ticket index
310e71b
@itinerare
Merge branch 'bootstrapTables' of https://github.com/preimpression/lo…
254c76e 
…rekeeper into modified-main
@itinerare
Merge branch 'modified-main' into modified-main-fork
371f869
@itinerare
Update masterlist sublist search for gift writing status
769a3c4
@itinerare
Merge pull request #39 from itinerare/modified-main-fork
fe02bd6 
Extension additions - Requires migration, add-site-settings
@itinerare
Merge branch 'master' into modified-main
046cdf4
@itinerare
Add character visibility check to ML sublists and user character queries
3dd147e
@itinerare
Add lorekeeper/extensions config settings for:
6efebd3 
- Toggling item entry expansion's extra fields
- Toggling its resale function
@itinerare
update readme
6ddec7e
@itinerare itinerare added the needs review Pull requests that are pending community review label Nov 16, 2020
@itinerare itinerare added this to the v2.0.0 milestone Nov 16, 2020
@corowne corowne mentioned this pull request Nov 16, 2020
Closed
28 tasks
@corowne corowne merged commit f769066 into develop Nov 16, 2020
@itinerare itinerare removed the request for review from corowne November 16, 2020 20:24
@itinerare itinerare removed the needs review Pull requests that are pending community review label Nov 16, 2020
@itinerare itinerare deleted the modified-main branch October 24, 2021 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
7 participants
@itinerare @corowne @ScuffedNewt @JuniJwi @ryannicmyk @Draginraptor @preimpression