kaniini
|
7a2c4f984b
|
Merge branch 'bugfix/fix-rejects' into 'develop'
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
|
6 years ago |
|
kaniini
|
d03a116654
|
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
|
6 years ago |
|
William Pitcock
|
57549f6043
|
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
|
6 years ago |
|
William Pitcock
|
cbb2b709de
|
activitypub: transmogrifier: fix follow request rejections
|
6 years ago |
|
Haelwenn
|
ebb3496386
|
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
|
6 years ago |
|
William Pitcock
|
61d6715714
|
rich media: oembed: return data in the same format as the other parsers
|
6 years ago |
|
William Pitcock
|
ddb5545202
|
rich media: kill some testsuite noise
|
6 years ago |
|
William Pitcock
|
0f11254a06
|
rich media: parser: add some basic sanity checks on the returned data with pattern matching
|
6 years ago |
|
William Pitcock
|
83b7062634
|
rich media: parser: cache negatives
|
6 years ago |
|
William Pitcock
|
8fb16e9f0f
|
rich media: parser: add copyright header
|
6 years ago |
|
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 |
|
lain
|
f53d464db0
|
Put deprecation warnings undre Pleroma.Config.
|
6 years ago |
|
lain
|
8e8a1e1ba8
|
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
|
6 years ago |
|
lain
|
bcc559e4e6
|
Update config.md
|
6 years ago |
|
lain
|
f1d58c5c49
|
Don't run warnings in a task.
|
6 years ago |
|
lain
|
39b2457734
|
Change default bg image in new config.
|
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 |
|
lain
|
f231313b70
|
Add deprecation warning mechanism.
|
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 |
|
William Pitcock
|
ddc7ae2c1a
|
mastodon api: card: force OGP images through mediaproxy
|
6 years ago |
|
William Pitcock
|
339c26e12b
|
test: add status posting with OGP link preview test
|
6 years ago |
|
William Pitcock
|
ebeabdcc72
|
rich media: helpers: clean up unused aliases
|
6 years ago |
|
William Pitcock
|
91ef64a1ec
|
activitypub: prime OGP crawler cache when new messages are inserted into the database
|
6 years ago |
|
William Pitcock
|
8e42251e06
|
rich media: add helpers module, use instead of MastodonAPI module
|
6 years ago |
|
William Pitcock
|
24a103a1fe
|
mastodon api: formatting
|
6 years ago |
|
William Pitcock
|
6096846f5f
|
API: kill /api/rich_media/parse endpoint
|
6 years ago |
|
William Pitcock
|
020b3b29d9
|
test: update twitterapi tests
|
6 years ago |
|
William Pitcock
|
07a9a891ad
|
twitter api: fix up activity representer
|
6 years ago |
|
William Pitcock
|
364cf5369b
|
test: update mastodon status view tests
|
6 years ago |
|
William Pitcock
|
de42646634
|
rich media: add try/rescue to ensure we catch parsing and fetching failures
|
6 years ago |
|
William Pitcock
|
5d895093fd
|
twitter api: embed card in twitterapi posts
|
6 years ago |
|
William Pitcock
|
5a37ddc2dc
|
mastodon api: embed card in status object
|
6 years ago |
|
William Pitcock
|
132d815f1f
|
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
|
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 |
