de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
2019-01-28 11:48:03 +00:00
df2f7b39dd
re f83bae7c: remove unnecessary filter
2019-01-28 12:24:14 +01:00
f231313b70
Add deprecation warning mechanism.
2019-01-28 12:09:41 +01:00
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
2019-01-28 11:41:47 +01:00
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
2019-01-28 06:42:27 +00:00
ebeabdcc72
rich media: helpers: clean up unused aliases
2019-01-28 06:10:25 +00:00
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
2019-01-28 06:07:18 +00:00
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
2019-01-28 06:04:54 +00:00
24a103a1fe
mastodon api: formatting
2019-01-28 05:53:17 +00:00
6096846f5f
API: kill /api/rich_media/parse endpoint
2019-01-28 05:53:17 +00:00
07a9a891ad
twitter api: fix up activity representer
2019-01-28 05:53:17 +00:00
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
2019-01-28 05:53:17 +00:00
5d895093fd
twitter api: embed card in twitterapi posts
2019-01-28 05:53:17 +00:00
5a37ddc2dc
mastodon api: embed card in status object
2019-01-28 05:53:17 +00:00
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
2019-01-28 05:53:17 +00:00
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
2019-01-28 04:47:32 +01:00
872241d7c5
/web/index template: Modify for glitch-soc
2019-01-28 04:43:36 +01:00
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
2019-01-27 22:51:50 +01:00
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
2019-01-27 20:10:09 +00:00
2e277dd4ad
Fix objects.
2019-01-27 21:03:15 +01:00
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
2019-01-27 19:10:15 +00:00
77f2137383
Transmogrifier: fix incoming objects with invalid likes
2019-01-27 19:33:21 +01:00
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
2019-01-27 19:16:20 +01:00
9af798ad40
Merge branch 'flake-random-worker-id' into 'develop'
...
Flake: random worker id
See merge request pleroma/pleroma!721
2019-01-27 15:16:06 +00:00
e0e0cc5ab0
Flake: random worker id
2019-01-27 16:04:36 +01:00
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-27 10:33:22 +01:00
8f2f471e94
rich media: gracefully handle fetching nil URIs
2019-01-26 16:36:17 +00:00
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
2019-01-26 16:17:50 +00:00
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
2019-01-26 16:58:23 +01:00
3e66723f7e
Merge branch 'join-in-preloads' into 'develop'
...
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
2019-01-26 15:57:02 +00:00
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
2019-01-26 16:46:20 +01:00
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
2019-01-26 15:24:16 +00:00
86037e9c39
mastodon api: use HTML.extract_first_external_url()
2019-01-26 15:13:27 +00:00
8018ae7ae5
Join on preloads to avoid N+1 queries
2019-01-26 15:55:53 +01:00
be9abb2cc5
html: add utility function to extract first URL from an object and cache the result
2019-01-26 14:55:12 +00:00
78047d57bf
mastodon api: provider_name setting is required too on the card
2019-01-26 14:47:32 +00:00
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
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
2019-01-26 14:18:23 +00:00
5a84def6a6
Fix the logic in multi-hashtag TLs
2019-01-26 04:46:02 +01:00
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
2019-01-26 04:46:01 +01:00
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
2019-01-26 04:46:01 +01:00
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
2019-01-26 04:45:36 +01:00
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
2019-01-26 03:50:49 +01:00
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
2019-01-25 20:38:13 +03:00
aa8ddfdbe2
SPC fixes: Fix activities.
2019-01-25 18:14:48 +01:00
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).
2019-01-25 18:29:43 +03:00
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
2019-01-25 15:10:21 +03:00
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
2019-01-25 10:40:51 +03:00
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
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
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
9274cabe01
Use correct logic to determine "attentions" list
2019-01-24 23:30:43 +03:00
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
2019-01-24 19:15:23 +03:00
a3ba72d978
Fix clippy with one/five lines
2019-01-24 16:53:14 +01:00
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
2019-01-24 17:37:23 +03:00
be43aa2875
FlakeId: ignore null mac for workerid, use first mac
2019-01-24 13:08:27 +01:00
54ec6d09b0
mrf: add anti-followbot policy
2019-01-24 09:35:19 +00:00
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
2019-01-24 11:54:52 +03:00
4333fea1dc
Send "hide_network" in user_view
2019-01-23 19:47:51 +03:00
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
2019-01-23 18:37:25 +03:00
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
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
2019-01-23 13:05:58 +01:00
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
a92c43bc4b
Clippy!
2019-01-23 11:26:38 +01:00
973c9eed18
Treat User.Info pinned ids as strings
2019-01-23 11:26:37 +01:00
e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion
2019-01-23 11:26:36 +01:00
422e60ad76
2019
2019-01-23 11:26:35 +01:00
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
2019-01-23 11:26:35 +01:00
9d63b27dcd
Test FlakeID old id compat & Ecto type
2019-01-23 11:26:34 +01:00
28d77e373c
Flake Ids for Users and Activities
2019-01-23 11:26:27 +01:00
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
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
2019-01-22 17:12:53 +03:00
e460820fcf
Add get_by_id to activity.ex
2019-01-22 10:55:10 +03:00
f9a3269099
Uploader callback controller
2019-01-21 22:44:14 +01:00
99763999c1
reverse_proxy - always override plug's cache-control
2019-01-21 15:17:24 +01:00
97412d9f94
S3 Namespace
2019-01-21 14:42:16 +01:00
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
2019-01-21 13:03:32 +00:00
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
a4d3fec8a7
[ #502 ] Code comments update.
2019-01-21 14:52:41 +03:00
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
2019-01-21 14:16:51 +03:00
7390192c03
Activity: mix format (2 empty lines)
2019-01-21 08:00:41 +01:00
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
2019-01-21 08:00:40 +01:00
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
2019-01-21 08:00:38 +01:00
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
2019-01-21 07:51:01 +01:00
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
2019-01-21 07:50:57 +01:00
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
2019-01-21 07:49:59 +01:00
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
2019-01-20 13:00:46 +01:00
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
2019-01-20 10:24:05 +00:00
5834b08fe7
Set custom similarity limit.
2019-01-20 10:57:49 +01:00
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
2019-01-20 02:33:21 +00:00
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
2019-01-20 02:27:48 +00:00
420651157b
transmogrifier: don't apply heuristics against messages which have `directMessage` set true
2019-01-20 02:27:48 +00:00
ddae43eb43
activitypub: add is_private?/is_direct? helpers
2019-01-20 02:27:48 +00:00
9adc80afff
common api: set directMessage flag on our own posts
2019-01-20 02:27:48 +00:00
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
2019-01-20 02:27:48 +00:00
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
2019-01-20 02:27:48 +00:00
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
2019-01-20 02:27:48 +00:00
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
2019-01-19 23:44:08 +00:00
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
2019-01-20 00:31:17 +01:00
44693fbf6e
Formating
2019-01-20 01:28:46 +03:00
afd83db0d7
Provide local og:url for remote activities
2019-01-19 10:58:27 +03:00
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
2019-01-19 07:36:58 +00:00
651a1d64b5
Add current user to mentioned
2019-01-19 04:25:15 +03:00
e116e55cab
Add actor to recipients
2019-01-18 22:40:52 +03:00
bd6c12592e
Add migration to fix spc users.
2019-01-18 19:35:47 +01:00
5d4d51e6dc
Add fixes for SPC users.
2019-01-18 19:25:37 +01:00
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
79e44042bc
[ #477 ] User trigram index adjustment.
2019-01-18 10:57:42 +03:00
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
2019-01-18 10:35:45 +03:00
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
2019-01-18 10:28:19 +03:00
1b1af4798a
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
2019-01-18 09:30:16 +03:00
75a9b2a851
activitypub: add a match clause for objects, not just activities
2019-01-17 23:32:16 +00:00
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
2019-01-17 23:21:31 +00:00
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
2019-01-17 23:21:31 +00:00
8e9f1d5587
activitypub: relay: chase selective public announce changes
2019-01-17 23:21:31 +00:00
2479e88815
activitypub: announce: add new public parameter
2019-01-17 23:21:31 +00:00
98d9dcd509
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
...
[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
2019-01-17 19:27:15 +00:00
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
2019-01-17 19:22:21 +00:00
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
2019-01-17 18:21:43 +01:00
a95d5da607
Don't show content if empty or zero width space
2019-01-17 20:18:28 +03:00
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
2019-01-17 19:16:02 +03:00
849c83ed46
formatting
2019-01-17 16:10:26 +00:00
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
2019-01-17 16:01:25 +00:00
388ceb6a7d
Fix the issue with get_by_nickname never being called
2019-01-17 19:00:08 +03:00
8c368d42a2
Make attachment links configurable
...
Thanks @href!
2019-01-17 15:48:14 +00:00
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
2019-01-17 18:03:49 +03:00
4d5f15cd42
Introduce optional unfurling of nsfw content
2019-01-17 11:00:02 +03:00
0256bd2f1d
Use object url instead of a hack
2019-01-17 10:34:19 +03:00
fd3a558230
Apply feld's patch
2019-01-17 09:18:46 +03:00
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
2019-01-16 18:04:41 +03:00
bb43f4cee9
Remove useless with in opengraph.ex
2019-01-16 18:02:46 +03:00
9a90b5d91a
oof
2019-01-16 18:01:17 +03:00
8a9f089812
remove id cast
2019-01-16 17:58:11 +03:00
5a08dee379
cache ap_id in id instead of caching user two times
2019-01-16 17:44:08 +03:00
82cf9b9751
forgot to remove this thing
2019-01-16 17:16:28 +03:00
293f6a8b71
join us now and share the software~. Also tests
2019-01-16 17:15:13 +03:00
943324b661
MastoAPI: Don't break on missing users.
2019-01-16 15:13:09 +01:00
b44995866b
Replace map with reduce to remove nils
2019-01-16 16:52:01 +03:00
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
2019-01-16 09:06:47 +00:00
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
2019-01-16 08:59:40 +00:00
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
2019-01-16 11:18:25 +03:00
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
2019-01-16 11:07:46 +03:00
bfe2a11a6b
Add config doc
2019-01-16 10:45:56 +03:00
0bc6d30f7d
[ #477 ] Minor refactoring (user search query).
2019-01-16 10:44:32 +03:00
a9c27e137d
Add a fallback function to handle generic params, just in case
2019-01-16 10:38:42 +03:00
a76793006b
Thanks you rinpatch, very cool
2019-01-16 10:35:06 +03:00
0039d45b5b
No need to use activity in the key
2019-01-16 10:30:47 +03:00
70b2bb6ede
add caching
2019-01-16 10:26:01 +03:00
dd1432d695
Disable previews for any activity, but create
2019-01-16 09:42:24 +03:00
461ab9489d
formatter: improve microformats markup
2019-01-16 03:54:01 +00:00
1ddab78247
html: allow microformats-related markup through the html filter
2019-01-16 03:54:01 +00:00
565caff3f4
cache HTML in OGP
2019-01-16 00:07:28 +03:00
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
2019-01-15 23:25:28 +03:00
9a444c0d22
Merge branch 'bugfix/websub-hardening' into 'develop'
...
websub: improve error handling
See merge request pleroma/pleroma!670
2019-01-15 20:02:56 +00:00
2e630bea0d
Add twitter card, filter nsfw
2019-01-15 23:00:22 +03:00
2d3241753f
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
2019-01-15 19:31:13 +00:00
70f140681f
Add space between name and nickname
2019-01-15 21:47:45 +03:00
e8eecd61b4
Formating
2019-01-15 21:20:27 +03:00
410fd9d774
Attach attachments
2019-01-15 21:17:56 +03:00
17da432dbb
websub: improve error handling
2019-01-15 18:03:49 +00:00
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
2019-01-15 20:00:21 +03:00
850912b06b
refactor opengraph to a different module with a behaviour
2019-01-15 19:43:52 +03:00
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
2019-01-15 18:34:47 +03:00
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
2019-01-15 13:05:25 +03:00
2858fd2da2
add a fallback function
2019-01-15 12:11:07 +03:00
6f23139864
please don't bully me for this
2019-01-15 12:02:55 +03:00
4587a5712a
cringe
2019-01-15 11:59:05 +03:00
ce15e0659e
Fix some edge cases [nervous laughter]
2019-01-15 11:56:35 +03:00
646bb87816
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
...
Fix Elixir 1.8 type annotation issue
Closes #523
See merge request pleroma/pleroma!668
2019-01-15 08:51:59 +00:00
4656f433f9
Move metadata.ex out of ostatus
2019-01-15 11:00:17 +03:00
9fcdca1bdc
Upload: Fix uploading with a : in the filename
2019-01-15 07:57:48 +01:00
e3eb75bd23
Upload: Fix uploading with a ? in the filename
2019-01-15 07:40:39 +01:00
e8eff9fe03
Fix Elixir 1.8 type annotation issue
2019-01-15 02:58:48 +02:00
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
2019-01-14 18:52:23 +00:00
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
2019-01-14 18:49:53 +00:00
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
2019-01-14 20:04:45 +03:00
42b7584068
URI escape file upload URLs
2019-01-14 11:31:44 -05:00
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
2019-01-14 07:28:04 +00:00
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
2019-01-14 07:27:05 +00:00
5f9786288d
Prefer ids to usernames
2019-01-14 09:52:52 +03:00
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
2019-01-14 05:42:38 +00:00
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
b8a77c5d70
Add OEmbed parser
2019-01-13 02:06:50 +02:00
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
2019-01-12 20:24:41 +01:00
581edd5a91
Add route to get object like activities
2019-01-12 20:24:38 +01:00
36711e1c83
Handle client submitted activitypub like activity
2019-01-12 20:24:35 +01:00
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
9daf162461
Honour parameters on MastoAPI /favourites
2019-01-12 14:42:52 +00:00
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
2019-01-12 14:03:35 +00:00
b594a54d0c
unpin when deleting a status
2019-01-11 12:31:31 +07:00
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
2019-01-10 18:42:36 +00:00
1f851a0723
Add Twitter Card parser
2019-01-10 18:09:56 +00:00
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
2019-01-10 03:54:29 +00:00
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
2019-01-10 03:45:58 +00:00
2ecf81f10c
common api: fix newlines in markdown code blocks
2019-01-10 03:37:37 +00:00
Haelwenn