lain
|
050c4b1f14
|
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
|
4 years ago |
|
lain
|
e6a14e1cd1
|
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
|
4 years ago |
|
Mark Felder
|
0faf8dbef8
|
Simplify migration
|
4 years ago |
|
lain
|
d0823d7f1e
|
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
|
4 years ago |
|
lain
|
dd937ae625
|
Merge branch 'fix/repo-terminate' into 'develop'
don't use continue in Stats init for test env
See merge request pleroma/pleroma!3349
|
4 years ago |
|
Alexander Strizhakov
|
da5d21a1cf
|
don't use continue in Stats init for test env
|
4 years ago |
|
Mark Felder
|
d35b6254b4
|
Store the client application data in ActivityStreams format
|
4 years ago |
|
feld
|
840686ecd5
|
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
|
4 years ago |
|
feld
|
2217b35bd4
|
Merge branch 'ecto-rollback-in-test-env' into 'develop'
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
|
4 years ago |
|
rinpatch
|
74bd9980ad
|
Merge branch 'PestToast-develop-patch-66930' into 'develop'
Removed a command that references "pleroma.env". This file does not seem to be...
See merge request pleroma/pleroma!3347
|
4 years ago |
|
PestToast
|
a30126271f
|
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.
|
4 years ago |
|
Mark Felder
|
76b166f040
|
Note our upgrade path for this functionality
|
4 years ago |
|
Mark Felder
|
902d4e4a4a
|
Leave a note for future explorers
|
4 years ago |
|
Mark Felder
|
2da71a526f
|
No need to filter out Mix.env() from the API routes.
|
4 years ago |
|
Mark Felder
|
1552179792
|
Improved recursion through the api route list
|
4 years ago |
|
Mark Felder
|
6b87dfad5d
|
Filter out MIX_ENV from route list and add a test
|
4 years ago |
|
Mark Felder
|
8ad1613717
|
Enum instead of Stream
|
4 years ago |
|
Mark Felder
|
cea31df6a6
|
Attempt to filter out API calls from FrontendStatic plug
|
4 years ago |
|
Haelwenn
|
6b6791f911
|
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files
See merge request pleroma/pleroma!3345
|
4 years ago |
|
Mark Felder
|
978627c5e1
|
Vi and emacs temp files
|
4 years ago |
|
Haelwenn
|
870f9cb80c
|
Merge branch 'docfix/chat-token' into 'develop'
Update terminology in differences_in_mastoapi_responses.md
See merge request pleroma/pleroma!3344
|
4 years ago |
|
zonk
|
f38056d2a1
|
Update terminology in differences_in_mastoapi_responses.md
|
4 years ago |
|
feld
|
d113ed94e7
|
Merge branch 'fix/whalebird-url' into 'develop'
Fix URL of Whalebird in docs
See merge request pleroma/pleroma!3339
|
4 years ago |
|
lain
|
022eb2a302
|
Merge branch 'chore/no-activitypub-sleeps' into 'develop'
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
See merge request pleroma/pleroma!3330
|
4 years ago |
|
AkiraFukushima
|
6ff4ef12fd
|
Fix URL of Whalebird in docs
|
4 years ago |
|
rinpatch
|
484ba5d062
|
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer)
Closes #2534
See merge request pleroma/pleroma!3338
|
4 years ago |
|
Ivan Tashkinov
|
0ef783baa1
|
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
7fc9cd0974
|
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
|
4 years ago |
|
feld
|
0edb5c805b
|
Merge branch 'revert/changelog' into 'develop'
Revert changelog entry that leaked from another branch.
See merge request pleroma/pleroma!3334
|
4 years ago |
|
Mark Felder
|
e31274f51d
|
Revert changelog entry that leaked from another branch.
|
4 years ago |
|
Haelwenn
|
f6d43cec42
|
Merge branch 'fix/filters' into 'develop'
Minor fixes to upload filters
See merge request pleroma/pleroma!3332
|
4 years ago |
|
Mark Felder
|
1cb417bce6
|
Document HeifToJpeg and its requirement of libheif's heic-convert tool
|
4 years ago |
|
Mark Felder
|
73aef0503c
|
Exiftool also cannot strip from heic files.
|
4 years ago |
|
Mark Felder
|
369581db6d
|
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
|
4 years ago |
|
Mark Felder
|
db7d6f337f
|
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
|
4 years ago |
|
Mark Felder
|
26b620d676
|
Permit :disclose_client in changesets
|
4 years ago |
|
Mark Felder
|
63739c5a58
|
Tests to validate client disclosure obeys user setting
|
4 years ago |
|
Mark Felder
|
83301fe61a
|
Add field to user schema for controlling disclosure of client details
|
4 years ago |
|
Mark Felder
|
d5ef02c7a7
|
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
|
4 years ago |
|
Alexander Strizhakov
|
1e6c27181e
|
expires_in in scheduled status params
|
4 years ago |
|
rinpatch
|
8829a408ec
|
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
ChatMessage schema: Add `unread` property
See merge request pleroma/pleroma!3323
|
4 years ago |
|
Haelwenn
|
c0437d1244
|
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Remove `:auth, :enforce_oauth_admin_scope_usage`
See merge request pleroma/pleroma!3327
|
4 years ago |
|
rinpatch
|
2ab9499258
|
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.
|
4 years ago |
|
rinpatch
|
95a22c1cc2
|
OpenAPI: Add `admin:` scope prefix to admin operations
Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs"
|
4 years ago |
|
rinpatch
|
6d66fadea7
|
Remove `:auth, :enforce_oauth_admin_scope_usage`
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
|
4 years ago |
|
rinpatch
|
679a2e799e
|
Merge branch 'test-docker-images' into 'develop'
Generate custom docker images for testing
See merge request pleroma/pleroma!3326
|
4 years ago |
|
Mark Felder
|
dc4baee6dd
|
Do not want these interfering with develop builds
|
4 years ago |
|
Mark Felder
|
068740aa16
|
Make it possible to generate custom docker images by prefixing the branch name with "build-docker"
|
4 years ago |
|
Haelwenn
|
046bcf1bf6
|
Merge branch 'chore/documentation-relicensing' into 'develop'
Relicense documentation under CC-BY-4.0
See merge request pleroma/pleroma!3322
|
4 years ago |
|
Haelwenn
|
e7b1f0f5f4
|
Merge branch 'feat/chat-list-pagination' into 'develop'
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
|
4 years ago |
