mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-10-31 22:18:52 +00:00
Merge branch 'main' into hide_followers_following
This commit is contained in:
commit
573172d45c
18 changed files with 38 additions and 30 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -37,5 +37,6 @@ shell.nix
|
|||
/.idea/
|
||||
/.fleet/
|
||||
|
||||
# ignore cache dir from mkdocs serve
|
||||
/.cache
|
||||
# ignore cached pngs from mkdocs serve,
|
||||
# while preserving cached fonts.
|
||||
/docs/.cache/plugin/social/*.png
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
version: 2
|
||||
|
||||
build:
|
||||
os: "ubuntu-20.04"
|
||||
os: ubuntu-22.04
|
||||
tools:
|
||||
python: "mambaforge-4.10" # https://docs.readthedocs.io/en/stable/guides/conda.html#making-builds-faster-with-mamba
|
||||
python: "mambaforge-22.9" # https://docs.readthedocs.io/en/stable/guides/conda.html#making-builds-faster-with-mamba
|
||||
|
||||
mkdocs:
|
||||
configuration: "mkdocs.yml"
|
||||
|
|
|
@ -110,7 +110,13 @@ When adding a new page, you need to include it in the [`mkdocs.yml`](mkdocs.yml)
|
|||
|
||||
If you don't use Conda, you can read the `docs/environment.yml` to see which dependencies are required and `pip install` them manually. It's advisable to do this in a virtual environment, which you can create with something like `python3 -m venv /path-to/store-the-venv`. You can then call `/path-to/store-the-venv/bin/pip`, `/path-to/store-the-venv/bin/mkdocs` etc.
|
||||
|
||||
In order to upgrade dependencies, use `conda update --update-all` in the activated environment. You can then update the `environment.yml` with `conda env export --from-history -f ./docs/environment.yml`, though you'll need to fix the `channels`. Beware that `conda env export` will also drop the `pip` dependencies, so make sure to add those back.
|
||||
In order to upgrade dependencies, use `conda update --update-all` in the activated environment. You can then update the `environment.yml` with:
|
||||
|
||||
```sh
|
||||
conda env export -n gotosocial-docs --from-history --override-channels -c conda-forge -c nodefaults -f ./docs/environment.yml
|
||||
```
|
||||
|
||||
Beware that `conda env export` will add a `prefix` entry to the environment.yml file, and drop the `pip` dependencies, so make sure to remove the prefix and add the `pip` dependencies back in.
|
||||
|
||||
## Development
|
||||
|
||||
|
|
BIN
docs/.cache/plugin/social/Roboto-Black.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Black.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-BlackItalic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-BlackItalic.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Bold.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Bold.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-BoldItalic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Italic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Italic.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Light.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Light.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-LightItalic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-LightItalic.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Medium.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Medium.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-MediumItalic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-MediumItalic.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Regular.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Regular.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-Thin.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-Thin.ttf
Normal file
Binary file not shown.
BIN
docs/.cache/plugin/social/Roboto-ThinItalic.ttf
Normal file
BIN
docs/.cache/plugin/social/Roboto-ThinItalic.ttf
Normal file
Binary file not shown.
|
@ -5,10 +5,10 @@ channels:
|
|||
dependencies:
|
||||
- cairosvg==2.7.1
|
||||
- mkdocs-material-extensions==1.3.1
|
||||
- mkdocs-material==9.5.8
|
||||
- mkdocs-material==9.5.15
|
||||
- mkdocs==1.5.3
|
||||
- pillow==10.0.0
|
||||
- pip==23.3.1
|
||||
- python==3.11.3=h2755cc3_0_cpython
|
||||
- pillow==10.2.0
|
||||
- pip==24
|
||||
- python==3.12
|
||||
- pip:
|
||||
- mkdocs-swagger-ui-tag==0.6.8
|
||||
- mkdocs-swagger-ui-tag==0.6.9
|
||||
|
|
|
@ -28,6 +28,7 @@ plugins:
|
|||
cards_layout_options:
|
||||
background_color: "#fd6a00"
|
||||
color: "#fafaff"
|
||||
cache_dir: "./docs/.cache/plugin/social"
|
||||
- swagger-ui-tag:
|
||||
supportedSubmitMethods: []
|
||||
syntaxHighlightTheme: obsidian
|
||||
|
|
|
@ -2146,13 +2146,13 @@ bn.js@^5.0.0, bn.js@^5.2.1:
|
|||
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
|
||||
integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
|
||||
|
||||
body-parser@1.20.1:
|
||||
version "1.20.1"
|
||||
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
|
||||
integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
|
||||
body-parser@1.20.2:
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
|
||||
integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
|
||||
dependencies:
|
||||
bytes "3.1.2"
|
||||
content-type "~1.0.4"
|
||||
content-type "~1.0.5"
|
||||
debug "2.6.9"
|
||||
depd "2.0.0"
|
||||
destroy "1.2.0"
|
||||
|
@ -2160,7 +2160,7 @@ body-parser@1.20.1:
|
|||
iconv-lite "0.4.24"
|
||||
on-finished "2.4.1"
|
||||
qs "6.11.0"
|
||||
raw-body "2.5.1"
|
||||
raw-body "2.5.2"
|
||||
type-is "~1.6.18"
|
||||
unpipe "1.0.0"
|
||||
|
||||
|
@ -2584,7 +2584,7 @@ content-disposition@0.5.4:
|
|||
dependencies:
|
||||
safe-buffer "5.2.1"
|
||||
|
||||
content-type@~1.0.4:
|
||||
content-type@~1.0.4, content-type@~1.0.5:
|
||||
version "1.0.5"
|
||||
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
|
||||
integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
|
||||
|
@ -2614,10 +2614,10 @@ cookie-signature@1.0.6:
|
|||
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
|
||||
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
|
||||
|
||||
cookie@0.5.0:
|
||||
version "0.5.0"
|
||||
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
|
||||
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
|
||||
cookie@0.6.0:
|
||||
version "0.6.0"
|
||||
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
|
||||
integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
|
||||
|
||||
core-js-compat@^3.31.0, core-js-compat@^3.32.2:
|
||||
version "3.33.0"
|
||||
|
@ -3337,16 +3337,16 @@ execall@^2.0.0:
|
|||
clone-regexp "^2.1.0"
|
||||
|
||||
express@^4.18.2:
|
||||
version "4.18.2"
|
||||
resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
|
||||
integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
|
||||
version "4.19.2"
|
||||
resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
|
||||
integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
|
||||
dependencies:
|
||||
accepts "~1.3.8"
|
||||
array-flatten "1.1.1"
|
||||
body-parser "1.20.1"
|
||||
body-parser "1.20.2"
|
||||
content-disposition "0.5.4"
|
||||
content-type "~1.0.4"
|
||||
cookie "0.5.0"
|
||||
cookie "0.6.0"
|
||||
cookie-signature "1.0.6"
|
||||
debug "2.6.9"
|
||||
depd "2.0.0"
|
||||
|
@ -5249,10 +5249,10 @@ rangetouch@^2.0.1:
|
|||
resolved "https://registry.yarnpkg.com/rangetouch/-/rangetouch-2.0.1.tgz#c01105110fd3afca2adcb1a580692837d883cb70"
|
||||
integrity sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==
|
||||
|
||||
raw-body@2.5.1:
|
||||
version "2.5.1"
|
||||
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
|
||||
integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
|
||||
raw-body@2.5.2:
|
||||
version "2.5.2"
|
||||
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
|
||||
integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
|
||||
dependencies:
|
||||
bytes "3.1.2"
|
||||
http-errors "2.0.0"
|
||||
|
|
Loading…
Reference in a new issue