Commit Graph

2373 Commits

Author SHA1 Message Date
kaniini 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
kaniini 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
Ivan Tashkinov 65bb9b2fba [#491] Made full nicknames be preserved in user links text only in Bio. 2019-01-18 09:30:16 +03:00
William Pitcock 75a9b2a851 activitypub: add a match clause for objects, not just activities 2019-01-17 23:32:16 +00:00
William Pitcock dbc4e92509 activitypub: transmogrifier: do not clobber the addressing on relayed announcements 2019-01-17 23:21:31 +00:00
William Pitcock 33b473cc02 activitypub: allow is_public?() to work on any type of map representing an AS2 object 2019-01-17 23:21:31 +00:00
William Pitcock 8e9f1d5587 activitypub: relay: chase selective public announce changes 2019-01-17 23:21:31 +00:00
William Pitcock 2479e88815 activitypub: announce: add new public parameter 2019-01-17 23:21:31 +00:00
kaniini 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
kaniini 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
sxsdv1 948fba6f76 Fix bad link in likes collection
Don't copy and paste, mkay
2019-01-17 18:21:43 +01:00
Ivan Tashkinov 954dc4a4ad [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users. 2019-01-17 19:16:02 +03:00
Mark Felder 849c83ed46 formatting 2019-01-17 16:10:26 +00:00
Mark Felder 6bc9a641ba Default to disabled in the code in case the setting is absent from config.exs 2019-01-17 16:01:25 +00:00
Mark Felder 8c368d42a2 Make attachment links configurable
Thanks @href!
2019-01-17 15:48:14 +00:00
Ivan Tashkinov 2bfae25a1f [#491] Made user bio preserve full nicknames (nick@host). 2019-01-17 18:03:49 +03:00
lain 943324b661 MastoAPI: Don't break on missing users. 2019-01-16 15:13:09 +01:00
lambda 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
lambda 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
Ivan Tashkinov 90433b988e [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses. 2019-01-16 11:07:46 +03:00
William Pitcock 461ab9489d formatter: improve microformats markup 2019-01-16 03:54:01 +00:00
William Pitcock 1ddab78247 html: allow microformats-related markup through the html filter 2019-01-16 03:54:01 +00:00
lambda 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
William Pitcock 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
William Pitcock 17da432dbb websub: improve error handling 2019-01-15 18:03:49 +00:00
lambda 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
Haelwenn (lanodan) Monnier 9fcdca1bdc
Upload: Fix uploading with a : in the filename 2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier e3eb75bd23
Upload: Fix uploading with a ? in the filename 2019-01-15 07:40:39 +01:00
Maxim Filippov e8eff9fe03 Fix Elixir 1.8 type annotation issue 2019-01-15 02:58:48 +02:00
rinpatch 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
lambda 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
Shadowfacts 42b7584068
URI escape file upload URLs 2019-01-14 11:31:44 -05:00
kaniini 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
kaniini fa0392e49c Merge branch 'activitypub-likes' into 'develop'
Activitypub c2s likes

See merge request pleroma/pleroma!658
2019-01-14 07:27:05 +00:00
William Pitcock 6e5b0406b9 mrf: add no placeholder-text policy, strips pointless "." content from posts with images 2019-01-14 05:42:38 +00:00
Maxim Filippov b8a77c5d70 Add OEmbed parser 2019-01-13 02:06:50 +02:00
sxsdv1 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
sxsdv1 581edd5a91 Add route to get object like activities 2019-01-12 20:24:38 +01:00
sxsdv1 36711e1c83 Handle client submitted activitypub like activity 2019-01-12 20:24:35 +01:00
sxsdv1 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
Sadposter 9daf162461 Honour parameters on MastoAPI /favourites 2019-01-12 14:42:52 +00:00
Sadposter 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
Egor Kislitsyn b594a54d0c unpin when deleting a status 2019-01-11 12:31:31 +07:00
kaniini 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
Maxim Filippov 1f851a0723 Add Twitter Card parser 2019-01-10 18:09:56 +00:00
kaniini 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
Haelwenn 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
William Pitcock 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
William Pitcock 2ecf81f10c common api: fix newlines in markdown code blocks 2019-01-10 03:37:37 +00:00
kaniini 7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00