Merge remote-tracking branch 'origin/main' into local-setup-windows

Author: perappu

docs/guides/update.md

@@ -15,8 +15,7 @@ If you yourself are interested in contributing to Lorekeeper, meanwhile, please
 The core Lorekeeper repository, or repo, has several different branches corresponding to different kinds and stages of development. There are two that are always present:
 
 - `main`, which always has the latest **stable release** of Lorekeeper. You can always pull this!
-- `develop`, which always has the latest updates and new features, but this means it's the **least stable**. You can always pull this, but be aware that changes will be more frequent and bugs more likely!
-    - As a general rule of thumb, it's recommended to only pull develop if you are confident in the ability of yourself or someone on your team to both resolve any bugs or issues that come up (as these may be specific to your site, depending on any existing modifications) *and* report (or, more ideally, contribute fixes for) any issues that are present in an **clean, unmodified** copy of the `develop` branch.
+- `develop`, which always has the latest updates and new features, but this means it's the **least stable**.
 
 "Stable", here, means that **no new features are being added**. Any change in the code in `main`, for instance, comes from either a new release or hotfix (which are only for critical issues!). This also tends to mean fewer bugs, as ideally most are caught and fixed before a a new version is released, and the lack of change means new bugs don't occur. Conversely, `develop` is the exact opposite: it always has the latest features, updates, etc.! Of course, this means that it always has the latest bugs. Similarly, new releases-- or updates to `main`-- happen relatively infrequently, while `develop` may be updated and added to at any time!
 
@@ -37,22 +36,15 @@ There are also three different *types* of branches. Branches of these types are
 
 ### Which branch do I pull?
 
-The answer to this question depends on whether you really need the latest features and/or how willing you're willing to handle potential bugs/bug reports, as well as how often you want to update your site. In summary:
-
-- `main`
-    - Most stable
-    - Updates least frequently
-    - Ideally, has the least bugs!
-- (If one exists) the current release branch
-    - Stable
-    - Release branches occur infrequently, and update with bugfixes as they are contributed
-    - Has a variable but diminishing number of bugs, generally
-- `develop`
-    - Least stable
-    - Updates most frequently
-    - Liable to have the most bugs!
-
-Regardless of which you choose, remember that you only need to pull one of them to receive all relevant updates for that branch! That is, any updates from one branch that apply to another will always be merged into the latter branch by contributors-- so if there is, for instance, a hotfix that is merged into `main`, but you are currently pulling the latest release branch, you don't need to pull `main` as well; the hotfix will also be merged into the release branch!
+In short, you should generally pull (in order of preference) the **current stable version** or the current release branch (if one exists). Note that if you pull a release branch, it's recommended to update your site frequently (as much as weekly) to receive any new bugfixes! 
+
+The `develop` branch is not recommended unless you are:
+
+- Following and/or actively participating in Lorekeeper's development, and able to understand the implications of changes as they are incorporated into the `develop` branch (including upon any other modifications made to your site) **on your own**
+- Willing and able to resolve most issues on your own
+- Ideally, willing and able to test against an **unmodified** copy of `develop` in the event that an issue is present in Lorekeeper itself, and report and/or contribute fixes for problems discovered this way
+
+This is both because `develop` is unstable, and because most extensions are built on the current stable version. This means that additional changes in `develop` can cause conflicts or introduce issues (including potential hard incompatibilities if there are breaking changes) that may not be obvious unless you are familiar with the codebase. As it is the most unstable branch, changes that cause these problems may potentially be incorporated into it at any time.
 
 ## Update Announcements
 

docs/version-history/v0.0.md

@@ -0,0 +1,100 @@
+# v0.0.x
+This page contains all updates before the initial release of Lorekeeper.
+
+## [240220]
+### Miscellaneous
+- dA package was swapped out for another one - verification should work on hosts without HTTP2 now.
+
+### Bug Fixes
+- Masterlist page error.
+- Prompt creation error.
+- Viewing completed raffle error.
+- Error while trying to delete a MYO slot.
+- Missing recipient_id trying to grant currency to a character.
+- 500 error in delete shop modal.
+- Trying to use a nonexistent table when deleting an item.
+- Error displaying ownership log to non-logged in users.
+- Error trying to edit a page.
+- Item category sorting not being reflected in inventory/shop stock.
+- Leaving the owner fields blank while creating a character would credit it to the first user without an alias.
+
+## [020320]
+### Miscellaneous
+- Removed time of registration from profiles (leaving only the date).
+- Some query optimisation.
+
+### Bug Fixes
+- Error 500 in inventory when no item categories exist (and similar areas).
+- Fixed display of character image credit links when a URL is entered.
+- Fixed breadcrumb link for user admin panel.
+- Made the logged in dashboard page links link to their respective pages.
+- Fixed currency icon not displaying.
+- Removed masterlist link from admin panel sidebar, since it didn't have a staff-only page.
+- Fixed error on deleting character categories.
+- Fixed masterlist search links in the encyclopedia.
+- Fixed bug with viewing the blacklist.
+
+## [090320]
+### New Additions
+- Create/edit/delete bookmarks.
+- Bookmark page.
+- Notifications for changes in bookmarked characters.
+- Toggleable thumbnail hiding.
+
+### Miscellaneous
+- Timezone abbreviations and UTC difference in tooltips.
+- Collapsible display of item description in shop stock description.
+- News page should display news posts newest first now.
+
+## [140320]
+### New Additions
+- Added option to transfer characters to an offsite user (for admin use only).
+
+### Bug Fixes
+- Entering a number in the character creation page for the character code is 1 keystroke off.
+- TOS agreement not required to be checked.
+- 500 error when clicking add image on character profile.
+- Undefined variable $oldUser when deleting item from user.
+- Error when trying to admin transfer a character owned by an offsite user to a registered user.
+- displayName error when trying to change traits on an image without a trait category.
+- Cannot see item addons when viewing a design update as staff.
+- Could create characters without a rarity, causing character page to give a 500 error.
+- Shops still display purchase section in modal when logged out.
+- Profile page shows non-visible characters.
+- If character creation fails, the page doesn't retain entered data (it now does for most of the form).
+
+## [170320]
+### New Additions
+- README.md file was added on Github.
+
+## [230320]
+### New Additions
+- Subtypes are creatable in the admin panel.
+- They function as an additional, optional field for feature creation/editing, character (image) creation/editing, design updates.
+- They don't impose any restriction on feature selection.
+- However, if a subtype is selected in a dropdown (for assigning a subtype to a character for instance), the species for the same thing must match up to the species of the subtype.
+- Species entries in the encyclopedia list any subtypes under them.
+- Masterlist search now has a subtype field.
+
+### Miscellaneous
+- Added a MYO slots page to user profiles.
+- Rarity cap on features selectable during design approval has been removed.
+- Submitted prompt page (admin view) now shows number of times the user has submitted the prompt and had it approved before.
+- Prompt queue shows name of submitter.
+- Log pages, queue pages etc. now break long links.
+- An image can now be uploaded for prompts, same as other encyclopedia entries.
+- Tweaked the appearance of raffle pages very slightly.
+
+### Bug Fixes
+- MYO slot count not being updated when someone links their dA account and had MYO slots credited to their account.
+- MYO slots were not selectable for trades.
+- Missing validation checks for deleting some basic data in the admin panel.
+- Redundant/non-working visibility toggle on character pages.
+
+## [250320]
+### Bug Fixes
+- Broke the MYO slot masterlist.
+
+## [270320]
+### Bug Fixes
+- Unable to create new traits.

docs/version-history/v1.5.md

@@ -1,13 +1,20 @@
 # v1.5.x
+
 This page contains all updates made for version 1.5.0 of Lorekeeper.
 
 ## v1.5.0
+
 [Release notes](https://github.com/lk-arpg/lorekeeper/releases/tag/v1.5.0)
 
-!!! example "WIP"
+### Miscellaneous
+
+- Moved Masterlist section of the admin sidebar to be above the Data section
+- Reorganized some of the Data section links on the admin sidebar to be sorted by purpose
+- Moved several category links out of the admin sidebar and into their target indexes: Trait Categories in Traits, Item Categories in Items, and Prompt Categories in Prompts
 
-    Documentation for this version is incomplete.
+### Bug Fixes
 
-Merge pull request [#30](https://github.com/lk-arpg/lorekeeper/pull/30) from preimpression/main
+- Can't remove abbreviation of existing currency when another currency exists with no abbreviation
 
-Adjustments to Admin Panel + Bugfix
+Pull requests merged
+[PR #30](https://github.com/lk-arpg/lorekeeper/pull/30) - preimpression/main

docs/version-history/v3.0.md

@@ -3,7 +3,7 @@ This page contains all updates made for version 3.0.0 of Lorekeeper.
 
 For upgrade instructions, please follow the [v3.0.0 upgrade guide](../../guides/upgrade/).
 
-This page was last updated with announcement **[110825]**.
+This page was last updated with announcement **[171125]**.
 
 ## v3.0.0 (Pre-release)
 [Release notes](https://github.com/lk-arpg/lorekeeper/releases/tag/v3.0.0-pre1)
@@ -252,7 +252,9 @@ Here are all Core Extensions added between v2.0.0 and v3.0.0:
 - Show 24 MYO slots per page instead of 30 ([PR #1238](https://github.com/lk-arpg/lorekeeper/pull/1238))
 - Update footer GitHub repo link ([PR #1255](https://github.com/lk-arpg/lorekeeper/pull/1255))
 - Updated contributing info ([PR #1303](https://github.com/lk-arpg/lorekeeper/pull/1303))
-- Implement eager loading for submission characters, images [PR #1319](https://github.com/lk-arpg/lorekeeper/pull/1319))
+- Implement eager loading for submission characters, images ([PR #1319](https://github.com/lk-arpg/lorekeeper/pull/1319))
+- Refactor stack name retrieval in character inventories ([PR #1318](https://github.com/lk-arpg/lorekeeper/pull/1318))
+- Use self-contained workflows ([PR #1356](https://github.com/lk-arpg/lorekeeper/pull/1356))
 
 ### Bug Fixes
 - Option to copy character slug is provided for MYO slots ([PR #756](https://github.com/lk-arpg/lorekeeper/pull/756))
@@ -361,3 +363,10 @@ Here are all Core Extensions added between v2.0.0 and v3.0.0:
 - Attempting to display user alias errors if no primary alias is set ([PR #1314](https://github.com/lk-arpg/lorekeeper/pull/1314))
 - Species and/or rarity can be removed when editing character image traits ([PR #1315](https://github.com/lk-arpg/lorekeeper/pull/1315))
 - ReCaptcha is missing on alias register view ([PR #1317](https://github.com/lk-arpg/lorekeeper/pull/1317))
+- Rank descriptions cannot be cleared ([PR #1323](https://github.com/lk-arpg/lorekeeper/pull/1323))
+- Rank info "help" icon shows on user profiles even if rank description is empty ([PR #1322](https://github.com/lk-arpg/lorekeeper/pull/1322))
+- Extra whitespace in page titles, meta tags ([PR #1324](https://github.com/lk-arpg/lorekeeper/pull/1324))
+- Password reset confirmation message always appears ([PR #1334](https://github.com/lk-arpg/lorekeeper/pull/1334))
+- Prompts section sidebar header is not styled appropriately ([PR #1339](https://github.com/lk-arpg/lorekeeper/pull/1339))
+- Character item stack name is not displayed in inventory ([PR #1342](https://github.com/lk-arpg/lorekeeper/pull/1342))
+- SQL error when entering a non-decimal value for character sale value ([PR #1348](https://github.com/lk-arpg/lorekeeper/pull/1348))

mkdocs.yml

@@ -75,6 +75,7 @@ nav:
     - Tutorial - Creating Item Types: 'guides/creating-item-types.md'
 
   - Version History:
+    - v0.0.x: 'version-history/v0.0.md'
     - v1.0.x: 'version-history/v1.0.md'
     - v1.1.x: 'version-history/v1.1.md'
     - v1.2.x: 'version-history/v1.2.md'
@@ -141,4 +142,7 @@ markdown_extensions:
   - pymdownx.superfences
   - pymdownx.details
   - pymdownx.snippets
-  
+
+plugins:
+   - glightbox
+   - search

pyproject.toml

@@ -18,7 +18,8 @@ dev = [
     # Allows setting up redirects when renaming docs files
     "mkdocs-redirects<2.0.0,>=1.2.1",
     "mkdocs-include-markdown-plugin<8.0.0,>=7.1.4",
+    "mkdocs-glightbox>=0.4.0",
 ]
 
 [tool.uv]
-package = false
+package = false