William Pitcock
|
1f7843b9b8
|
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
|
2019-01-26 15:24:16 +00:00 |
|
William Pitcock
|
86037e9c39
|
mastodon api: use HTML.extract_first_external_url()
|
2019-01-26 15:13:27 +00:00 |
|
William Pitcock
|
be9abb2cc5
|
html: add utility function to extract first URL from an object and cache the result
|
2019-01-26 14:55:12 +00:00 |
|
William Pitcock
|
78047d57bf
|
mastodon api: provider_name setting is required too on the card
|
2019-01-26 14:47:32 +00:00 |
|
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.
|
2019-01-26 14:18:23 +00:00 |
|
Haelwenn (lanodan) Monnier
|
3f64379b13
|
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
|
2019-01-26 14:18:23 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d9f3af477d
|
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
|
2019-01-26 14:18:23 +00:00 |
|
kaniini
|
c00fba4f7d
|
Merge branch 'documentation/mastalab' into 'develop'
README: Mastalab officially supports Pleroma.
See merge request pleroma/pleroma!713
|
2019-01-26 14:10:42 +00:00 |
|
William Pitcock
|
18b80be5ee
|
README: Mastalab officially supports Pleroma.
|
2019-01-26 14:10:26 +00:00 |
|
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
|
2019-01-26 13:41:18 +00:00 |
|
Haelwenn (lanodan) Monnier
|
499a4591a4
|
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
|
2019-01-26 04:23:52 +01:00 |
|
Haelwenn (lanodan) Monnier
|
15aa45ae8a
|
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
|
2019-01-26 03:50:49 +01:00 |
|
kaniini
|
6383fa3a5d
|
Merge branch 'oembed_provider' into 'develop'
Opengraph/TwitterCard::summary for statuses and user profiles
See merge request pleroma/pleroma!533
|
2019-01-25 15:16:12 +00:00 |
|
lambda
|
b9cd5117a1
|
Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'
update pleroma frontend (summary_html hotfix)
See merge request pleroma/pleroma!710
|
2019-01-25 10:23:43 +00:00 |
|
William Pitcock
|
57c3f8214c
|
update pleroma frontend (summary_html hotfix)
|
2019-01-25 10:17:00 +00:00 |
|
rinpatch
|
a45a903480
|
Fix OGP provider tests
|
2019-01-25 10:51:06 +03:00 |
|
rinpatch
|
3a5b3c5a3a
|
Merge remote-tracking branch 'pl/develop' into oembed_provider
|
2019-01-25 10:40:51 +03:00 |
|
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
2019-01-25 05:19:32 +00:00 |
|
kaniini
|
c9b418e547
|
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
|
2019-01-25 05:00:47 +00:00 |
|
kaniini
|
4df71cd88b
|
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
|
2019-01-25 04:59:06 +00:00 |
|
kaniini
|
9bf1a4234d
|
Merge branch 'update/pleroma-fe-20190125' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!709
|
2019-01-25 04:57:05 +00:00 |
|
William Pitcock
|
4b76f14da1
|
update pleroma frontend
|
2019-01-25 04:49:35 +00:00 |
|
Maxim Filippov
|
9274cabe01
|
Use correct logic to determine "attentions" list
|
2019-01-24 23:30:43 +03:00 |
|
href
|
a3ba72d978
|
Fix clippy with one/five lines
|
2019-01-24 16:53:14 +01:00 |
|
kaniini
|
2ebabaeb9c
|
Merge branch 'fix-activity_visibility-autovacuum' into 'develop'
Fix postgres activity_visibility when running in autovacuum
See merge request pleroma/pleroma!708
|
2019-01-24 13:22:34 +00:00 |
|
href
|
e02b19d1d7
|
Fix postgres activity_visibility when running in autovacuum
|
2019-01-24 14:13:20 +01:00 |
|
href
|
be43aa2875
|
FlakeId: ignore null mac for workerid, use first mac
|
2019-01-24 13:08:27 +01:00 |
|
href
|
0f80bc2dca
|
Merge branch 'feature/mrf-anti-followbot' into 'develop'
mrf: add anti-followbot policy
See merge request pleroma/pleroma!706
|
2019-01-24 10:20:22 +00:00 |
|
William Pitcock
|
13d72826df
|
test: add anti-followbot policy tests
|
2019-01-24 09:50:40 +00:00 |
|
William Pitcock
|
54ec6d09b0
|
mrf: add anti-followbot policy
|
2019-01-24 09:35:19 +00:00 |
|
kaniini
|
4983e6e9d2
|
Merge branch 'fix/hide-network-setting' into 'develop'
Send "hide_network" in user_view
See merge request pleroma/pleroma!704
|
2019-01-23 23:47:36 +00:00 |
|
Maxim Filippov
|
4333fea1dc
|
Send "hide_network" in user_view
|
2019-01-23 19:47:51 +03:00 |
|
kaniini
|
4a278cd80a
|
Merge branch 's3-namespace' into 'develop'
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
|
2019-01-23 13:25:04 +00:00 |
|
href
|
abb349bde0
|
Merge branch 'fix-info-id' into 'develop'
Fix info ids.
Closes #511
See merge request pleroma/pleroma!702
|
2019-01-23 13:20:34 +00:00 |
|
lain
|
ab03f81219
|
Fix info ids.
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.
Closes #511
|
2019-01-23 14:01:44 +01:00 |
|
lambda
|
5067b791a1
|
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
|
2019-01-23 12:14:41 +00:00 |
|
lain
|
2de208817c
|
Merge branch 'develop' into rename/pleroma_activity_consistency
|
2019-01-23 13:05:58 +01:00 |
|
href
|
9ba6e1fabe
|
FlakeId: chain alter statements
|
2019-01-23 12:09:21 +01:00 |
|
href
|
e67bd93d90
|
Flake: migrate pinned_activities in jsonb
|
2019-01-23 11:26:39 +01:00 |
|
href
|
a92c43bc4b
|
Clippy!
|
2019-01-23 11:26:38 +01:00 |
|
href
|
465fb4327d
|
Lock activities/users table during flake migration.
|
2019-01-23 11:26:37 +01:00 |
|
href
|
973c9eed18
|
Treat User.Info pinned ids as strings
|
2019-01-23 11:26:37 +01:00 |
|
href
|
e36a434b99
|
FlakeId.from_string/1: remove old, un-needed conversion
|
2019-01-23 11:26:36 +01:00 |
|
href
|
422e60ad76
|
2019
|
2019-01-23 11:26:35 +01:00 |
|
href
|
cdc5e6ff5c
|
ActivityPub: restrict_since/restrict_max: ignore empty param
|
2019-01-23 11:26:35 +01:00 |
|
href
|
9d63b27dcd
|
Test FlakeID old id compat & Ecto type
|
2019-01-23 11:26:34 +01:00 |
|
href
|
28d77e373c
|
Flake Ids for Users and Activities
|
2019-01-23 11:26:27 +01:00 |
|
href
|
b624b7a150
|
Merge branch 'mr/20190122-activity-visibility-update' into 'develop'
slightly changes definition so that autovacuum works parallel safe too
Closes #540
See merge request pleroma/pleroma!697
|
2019-01-22 16:10:38 +00:00 |
|
Michael Loftis
|
98cbeae49c
|
slightly changes definition so that autovacuum works paralell safe too
|
2019-01-22 15:35:21 +00:00 |
|
Haelwenn
|
707cd9389c
|
Merge branch 'fix/activity_get_by_id' into 'develop'
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
|
2019-01-22 14:28:17 +00:00 |
|