Commit Graph

3299 Commits

Author SHA1 Message Date
href 97412d9f94
S3 Namespace 2019-01-21 14:42:16 +01: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
rinpatch ab78cfbd07 Merge branch 'bugfix/upload_with_question_mark' into 'develop'
Upload: Fix uploading with a ? in the filename

See merge request pleroma/pleroma!669
2019-01-15 07:01:50 +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 dcbe5bd58c
Add attachment escaping test 2019-01-14 13:29:38 -05: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
kaniini c445c9e125 Merge branch 'fix-nginx-caching' into 'develop'
Fix nginx caching issues

See merge request pleroma/pleroma!654
2019-01-14 07:25:08 +00:00
kaniini 15f69b43a1 Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'
mrf: add no placeholder-text policy, strips pointless "." content from posts with images

See merge request pleroma/pleroma!662
2019-01-14 07:23:33 +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
lambda fbcb6f76b6 Merge branch 'bugfix/favourites-link-header' into 'develop'
Add link headers and honour parameters on Mastodon API /favourites

See merge request pleroma/pleroma!659
2019-01-13 16:01:15 +00:00
Sadposter 98d9ae0718 Add test for mastodon API /favourites endpoint 2019-01-13 15:17:47 +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
kaniini 19b6a82393 Merge branch 'bugfix/pinned-statuses' into 'develop'
Unpin when deleting a status

See merge request pleroma/pleroma!655
2019-01-11 23:09:41 +00:00
scarlett eeb9e632e4 Merge branch 'fix-spellign' into 'develop'
Fix spellign.

See merge request pleroma/pleroma!656
2019-01-11 10:02:25 +00:00
scarlett 9eba6b96dc Fix spellign. 2019-01-11 09:55:33 +00:00
Egor Kislitsyn 728587fdaa typo 2019-01-11 12:47:44 +07:00
Egor Kislitsyn b594a54d0c unpin when deleting a status 2019-01-11 12:31:31 +07:00
Mark Felder cc3a83a730 Fix nginx caching issues
Nginx is currently not caching data because proxy_buffering needs to be
enabled for caching to work at all, and we are receiving a Cache-Control
header from Pleroma that states "max-age=0, private, must-revalidate"

Even disregarding the Cache-Control header that should actually be set
to "public, max-age=1209600" as defined in the reverse_proxy code, we
don't want to obey this header at all as it overrides our Nginx caching
rules.
2019-01-10 21:29:05 +00:00
kaniini e4b2cfa7b5 Merge branch 'fix-varnish-chunked' into 'develop'
Fix varnish chunked and general improvements

See merge request pleroma/pleroma!653
2019-01-10 18:49:00 +00: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
Mark Felder efaa41fad2 Consistent intentation 2019-01-10 18:29:36 +00:00
Mark Felder fda942c329 Cache partial objects for 10 minutes
This enables caching/streaming of chunked responses
2019-01-10 18:28:14 +00:00
Mark Felder ce224ba5f0 Streaming is enabled by default
Support more filetypes for caching static media
2019-01-10 18:23:22 +00:00
kaniini 9be539f0c1 Merge branch 'feature/add-twitter-card-parser' into 'develop'
Add Twitter Card parser

See merge request pleroma/pleroma!643
2019-01-10 18:09:56 +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 490c80bc96 test: common api: add tests for format_input/4 2019-01-10 03:46:34 +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
kaniini f85d108c41 Merge branch 'mass-follow' into 'develop'
Mass follow

See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +00:00
kaniini d203b0b4d3 Merge branch 'dm-optimizations' into 'develop'
Add activity visibility index.

See merge request pleroma/pleroma!646
2019-01-10 02:31:29 +00:00
kaniini be92edcb29 Merge branch 'fix-alphasort' into 'develop'
Alpha sort the restricted nicknames

See merge request pleroma/pleroma!650
2019-01-10 01:08:33 +00:00
Mark Felder 5419b1a030 Alpha sort the restricted nicknames 2019-01-10 00:06:03 +00:00
rinpatch b57db828c7 Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
Rich media: Remove :commit since a tuple is already returned

See merge request pleroma/pleroma!649
2019-01-09 18:42:00 +00:00
rinpatch a2d7f0e0e9 Remove :commit since a tuple is already returned 2019-01-09 21:35:01 +03:00
lain a99e156f2c Add integer casts. 2019-01-09 18:17:23 +01:00