lain
deeda94513
update frontend
2019-01-20 11:28:11 +01: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
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
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
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
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
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
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
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
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
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