Commit Graph

3784 Commits

Author SHA1 Message Date
rinpatch 64143d8040 Fix object id in OpenGraph test 2019-01-17 22:57:24 +03: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
kaniini f73b5bd05f Merge branch 'attachment-links' into 'develop'
Make attachment links configurable

See merge request pleroma/pleroma!677
2019-01-17 19:21:54 +00:00
kaniini 9fa761620d Merge branch 'change-mix-location' into 'develop'
systemd: Add comments and change default path of the Mix binary.

See merge request pleroma/pleroma!680
2019-01-17 19:21:07 +00:00
shibayashi 2a818a3e77
Add comments and change default path of the Mix binary. 2019-01-17 19:49:54 +01:00
sxsdv1 948fba6f76 Fix bad link in likes collection
Don't copy and paste, mkay
2019-01-17 18:21:43 +01:00
rinpatch a95d5da607 Don't show content if empty or zero width space 2019-01-17 20:18:28 +03: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
rinpatch 388ceb6a7d Fix the issue with get_by_nickname never being called 2019-01-17 19:00:08 +03:00
Mark Felder 207489aa25 Also add to default config 2019-01-17 15:50:34 +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
rinpatch 3b18789684 Fix test 2019-01-17 11:08:50 +03:00
rinpatch 4d5f15cd42 Introduce optional unfurling of nsfw content 2019-01-17 11:00:02 +03:00
rinpatch 0256bd2f1d Use object url instead of a hack 2019-01-17 10:34:19 +03:00
rinpatch fd3a558230 Apply feld's patch 2019-01-17 09:18:46 +03:00
kaniini ce2efd1ee2 Merge branch 'resilient-user-view-2' into 'develop'
MastoAPI: Don't break on missing users.

See merge request pleroma/pleroma!675
2019-01-17 03:19:55 +00:00
rinpatch 5fa508cc2b Remove @providers and call Pleroma.config on runtime 2019-01-16 18:04:41 +03:00
rinpatch bb43f4cee9 Remove useless with in opengraph.ex 2019-01-16 18:02:46 +03:00
rinpatch 9a90b5d91a oof 2019-01-16 18:01:17 +03:00
rinpatch 8a9f089812 remove id cast 2019-01-16 17:58:11 +03:00
rinpatch 5a08dee379 cache ap_id in id instead of caching user two times 2019-01-16 17:44:08 +03:00
rinpatch 76f80940da oops 2019-01-16 17:19:01 +03:00
rinpatch 82cf9b9751 forgot to remove this thing 2019-01-16 17:16:28 +03:00
rinpatch 293f6a8b71 join us now and share the software~. Also tests 2019-01-16 17:15:13 +03:00
lain 943324b661 MastoAPI: Don't break on missing users. 2019-01-16 15:13:09 +01:00
rinpatch b44995866b Replace map with reduce to remove nils 2019-01-16 16:52:01 +03: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
rinpatch 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
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
rinpatch 8cea00e1dc Remove OpenGraph test from Ostatus tests 2019-01-16 10:53:57 +03:00
rinpatch bfe2a11a6b Add config doc 2019-01-16 10:45:56 +03:00
Ivan Tashkinov 0bc6d30f7d [#477] Minor refactoring (user search query). 2019-01-16 10:44:32 +03:00
rinpatch a9c27e137d Add a fallback function to handle generic params, just in case 2019-01-16 10:38:42 +03:00
rinpatch a76793006b Thanks you rinpatch, very cool 2019-01-16 10:35:06 +03:00
rinpatch 0039d45b5b No need to use activity in the key 2019-01-16 10:30:47 +03:00
rinpatch 70b2bb6ede add caching 2019-01-16 10:26:01 +03:00
rinpatch dd1432d695 Disable previews for any activity, but create 2019-01-16 09:42:24 +03:00
William Pitcock 85a5be6220 tests: fixup 2019-01-16 04:09:01 +00: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
rinpatch 565caff3f4 cache HTML in OGP 2019-01-16 00:07:28 +03:00
rinpatch 9aa69e12b8 Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate 2019-01-15 23:25:28 +03: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
rinpatch 2e630bea0d Add twitter card, filter nsfw 2019-01-15 23:00:22 +03:00
lambda d1c40cbca0 Merge branch 'bugfix/tesla-query-params' into 'develop'
Make OStatus Work Again

See merge request pleroma/pleroma!671
2019-01-15 20:00:22 +00:00