kaniini
|
009273fd6e
|
Merge branch 'app-list-changes' into 'develop'
App list changes: Separate into two categories, and drop Subway Tooter.
See merge request pleroma/pleroma!731
|
6 years ago |
|
scarlett
|
b57b56ff3e
|
App list changes: Separate into two categories, and drop Subway Tooter.
|
6 years ago |
|
Haelwenn
|
de0fb88a9c
|
Merge branch 'safe-render-activities' into 'develop'
remove unnecessary filter (re !723)
See merge request pleroma/pleroma!729
|
6 years ago |
|
href
|
df2f7b39dd
|
re f83bae7c: remove unnecessary filter
|
6 years ago |
|
href
|
74ed1b4d87
|
Merge branch 'oauth-login-failure-bug' into 'develop'
Correctly handle invalid credentials on auth login.
Closes #407
See merge request pleroma/pleroma!728
|
6 years ago |
|
lain
|
1825118fd4
|
Correctly handle invalid credentials on auth login.
Closes #407
|
6 years ago |
|
Haelwenn
|
b380b4898d
|
Merge branch 'patch-2' into 'develop'
Update the openrc service's retry with the correct format
See merge request pleroma/pleroma!727
|
6 years ago |
|
vaartis
|
9e43a28bc3
|
Update the openrc service's retry with the correct format
|
6 years ago |
|
rinpatch
|
6db792124b
|
Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404
See merge request pleroma/pleroma!725
|
6 years ago |
|
href
|
71bb90073b
|
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
|
6 years ago |
|
lambda
|
16ab1437d6
|
Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
|
6 years ago |
|
kaniini
|
ea12371a01
|
Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
|
6 years ago |
|
href
|
77f2137383
|
Transmogrifier: fix incoming objects with invalid likes
|
6 years ago |
|
href
|
f83bae7c22
|
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
|
6 years ago |
|
kaniini
|
00fd9c9e5c
|
Merge branch 'hotfix/favorites-index' into 'develop'
add activities likes index, fixes favorites API call
See merge request pleroma/pleroma!722
|
6 years ago |
|
kaniini
|
9af798ad40
|
Merge branch 'flake-random-worker-id' into 'develop'
Flake: random worker id
See merge request pleroma/pleroma!721
|
6 years ago |
|
William Pitcock
|
15d12a69a4
|
add activities likes index, fixes favorites API call
|
6 years ago |
|
href
|
e0e0cc5ab0
|
Flake: random worker id
|
6 years ago |
|
rinpatch
|
6c41c54d1b
|
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities
See merge request pleroma/pleroma!720
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
37520e1e79
|
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
|
6 years ago |
|
kaniini
|
5eb81d2c72
|
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
|
6 years ago |
|
Haelwenn
|
b58e4ddb10
|
Merge branch 'features/masto-account-view-rights' into 'develop'
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes #557
See merge request pleroma/pleroma!718
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
a65c188593
|
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
|
6 years ago |
|
Haelwenn
|
7175793304
|
Merge branch 'hardening/mastodon-rich-media' into 'develop'
rich media: minor hardening
See merge request pleroma/pleroma!717
|
6 years ago |
|
kaniini
|
c410fe960c
|
Merge branch 'webpush-endpoint-size' into 'develop'
Change webpush endpoint to unlimited varchar
Closes #552
See merge request pleroma/pleroma!716
|
6 years ago |
|
William Pitcock
|
8f2f471e94
|
rich media: gracefully handle fetching nil URIs
|
6 years ago |
|
href
|
4a13bb75bd
|
Change webpush endpoint to unlimited varchar
Fixes #552
|
6 years ago |
|
kaniini
|
155a884300
|
Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
|
6 years ago |
|
href
|
d6015338c8
|
Flake: support integers in from_string/1
Some previously issued stateless tokens have integer ids in them.
|
6 years ago |
|
kaniini
|
3e66723f7e
|
Merge branch 'join-in-preloads' into 'develop'
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
|
6 years ago |
|
kaniini
|
e91f867cc9
|
Merge branch 'features/mastoapi-cards' into 'develop'
MastoAPI: Add Rich-Media support
See merge request pleroma/pleroma!664
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
de956b9e04
|
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
|
6 years ago |
|
William Pitcock
|
1f7843b9b8
|
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
|
6 years ago |
|
William Pitcock
|
86037e9c39
|
mastodon api: use HTML.extract_first_external_url()
|
6 years ago |
|
href
|
8018ae7ae5
|
Join on preloads to avoid N+1 queries
|
6 years ago |
|
William Pitcock
|
be9abb2cc5
|
html: add utility function to extract first URL from an object and cache the result
|
6 years ago |
|
William Pitcock
|
78047d57bf
|
mastodon api: provider_name setting is required too on the card
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
39863236eb
|
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
3f64379b13
|
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
d9f3af477d
|
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
|
6 years ago |
|
kaniini
|
c00fba4f7d
|
Merge branch 'documentation/mastalab' into 'develop'
README: Mastalab officially supports Pleroma.
See merge request pleroma/pleroma!713
|
6 years ago |
|
William Pitcock
|
18b80be5ee
|
README: Mastalab officially supports Pleroma.
|
6 years ago |
|
kaniini
|
b050d27c2d
|
Merge branch 'bugfix/content_nil_lenght_check' into 'develop'
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
See merge request pleroma/pleroma!711
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
22f2687f17
|
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
5a84def6a6
|
Fix the logic in multi-hashtag TLs
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
4ad0ad14ed
|
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
d8f446f438
|
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
1a9bb4daa0
|
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f9cae0d04f
|
[WIP,MastoAPI] Multi-tag timelines
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
499a4591a4
|
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
|
6 years ago |
