kaniini
|
2d957b985f
|
Merge branch 'bugfix/unshared-inbox-check' into 'develop'
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
See merge request pleroma/pleroma!392
|
2018-10-26 01:36:07 +00:00 |
|
William Pitcock
|
f6cb963df2
|
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
|
2018-10-26 01:24:22 +00:00 |
|
kaniini
|
72031e80d7
|
Merge branch 'feature/nodeinfo-frontend-config' into 'develop'
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
See merge request pleroma/pleroma!329
|
2018-10-25 23:49:04 +00:00 |
|
Haelwenn (lanodan) Monnier
|
7906dfe5a0
|
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings
|
2018-10-26 01:06:34 +02:00 |
|
Haelwenn (lanodan) Monnier
|
57330dd91b
|
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
|
2018-10-26 01:06:19 +02:00 |
|
kaniini
|
9fe9c09883
|
Merge branch 'finmoji-optional' into 'develop'
Make finmoji optional
See merge request pleroma/pleroma!391
|
2018-10-25 18:24:07 +00:00 |
|
scarlett
|
ae5beb7b64
|
Make finmoji optional
|
2018-10-25 17:58:46 +01:00 |
|
kaniini
|
63556150e1
|
Merge branch 'bugfix/user-inbox-bcc' into 'develop'
activitypub: splice users into recipient lists when they receive messages at their personal inbox
Closes #343
See merge request pleroma/pleroma!390
|
2018-10-25 05:30:52 +00:00 |
|
William Pitcock
|
b1d1f9bc27
|
tests: add test for user inbox
|
2018-10-25 05:24:17 +00:00 |
|
William Pitcock
|
ce70eb8c00
|
activitypub utils: fix user splicing
|
2018-10-25 05:24:01 +00:00 |
|
William Pitcock
|
2f1f1a4f30
|
activitypub: splice users into recipient lists when they receive messages at their personal inbox
closes #343
|
2018-10-25 05:02:21 +00:00 |
|
kaniini
|
9e9b1bd5ea
|
Merge branch 'bugfix/ap-uri-user-search' into 'develop'
transmogrifier: do not try to contain origin of something which doesn't have one
Closes #340
See merge request pleroma/pleroma!389
|
2018-10-25 04:38:46 +00:00 |
|
Haelwenn
|
79b1e4465f
|
Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'
[Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json
Closes #233
See merge request pleroma/pleroma!257
|
2018-10-25 04:35:29 +00:00 |
|
William Pitcock
|
5383887bd4
|
transmogrifier: do not try to contain origin of something which doesn't have one
|
2018-10-25 04:27:33 +00:00 |
|
Haelwenn (lanodan) Monnier
|
b386888a0e
|
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
Better be sure than sorry
|
2018-10-25 06:21:11 +02:00 |
|
kaniini
|
4646794ee2
|
Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'
twitterapi graph enrichment
See merge request pleroma/pleroma!388
|
2018-10-25 04:16:40 +00:00 |
|
William Pitcock
|
6cfba7db8d
|
tests: twitterapi: add additional fields
|
2018-10-25 04:06:42 +00:00 |
|
William Pitcock
|
1ed25c963a
|
twitterapi: activity view: add the other in_reply_to fields
|
2018-10-25 04:04:04 +00:00 |
|
William Pitcock
|
1b480e3514
|
user: add helper for fetching profile url (which may be different than ap id)
|
2018-10-25 04:01:59 +00:00 |
|
Haelwenn (lanodan) Monnier
|
b112112c11
|
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
|
2018-10-25 05:52:45 +02:00 |
|
Haelwenn (lanodan) Monnier
|
b0a940d5a2
|
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
|
2018-10-25 05:24:03 +02:00 |
|
Haelwenn (lanodan) Monnier
|
2da0ffeb28
|
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
|
2018-10-25 05:24:03 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0c10be8731
|
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
|
2018-10-25 05:24:03 +02:00 |
|
Haelwenn (lanodan) Monnier
|
3b0e9287a5
|
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
|
2018-10-25 05:24:01 +02:00 |
|
kaniini
|
a8137159c2
|
Merge branch 'feature/in-reply-to-screen-name' into 'develop'
initial graph traversal support
Closes #68
See merge request pleroma/pleroma!387
|
2018-10-25 03:11:19 +00:00 |
|
William Pitcock
|
9563f3766d
|
tests: update for new in_reply_to_screen_name field
|
2018-10-25 03:03:44 +00:00 |
|
William Pitcock
|
fee43ae5e7
|
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
|
2018-10-25 02:59:04 +00:00 |
|
William Pitcock
|
f3f736afc4
|
activity: add helper to fetch an activity's parent
|
2018-10-25 02:47:55 +00:00 |
|
kaniini
|
4b2a586942
|
Merge branch 'update-pleroma-frontend' into 'develop'
Update pleroma frontend
See merge request pleroma/pleroma!385
|
2018-10-25 00:16:15 +00:00 |
|
kaniini
|
8cc08b94ec
|
Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'
Add some security directives to the systemd example file
See merge request pleroma/pleroma!386
|
2018-10-25 00:15:29 +00:00 |
|
shibayashi
|
043cb7138e
|
Add a little bit more detail in the comments.
|
2018-10-25 00:57:47 +02:00 |
|
shibayashi
|
0a58428de6
|
Add some security related directives to the systemd service example
|
2018-10-25 00:37:31 +02:00 |
|
scarlett
|
7cb227dc62
|
update pleroma-fe
|
2018-10-23 12:16:49 +01:00 |
|
scarlett
|
f6dda65dda
|
update pleroma-fe
|
2018-10-23 12:15:48 +01:00 |
|
kaniini
|
945ce9910d
|
Merge branch 'bugfix/html-scrub-comments' into 'develop'
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
|
2018-10-23 00:56:09 +00:00 |
|
kaniini
|
bcae57afd2
|
Merge branch 'new-frontend-options' into 'develop'
New frontend options
See merge request pleroma/pleroma!383
|
2018-10-23 00:50:28 +00:00 |
|
William Pitcock
|
8613db0e3b
|
html: ensure comments are correctly scrubbed
|
2018-10-23 00:48:49 +00:00 |
|
scarlett
|
3e79d941c8
|
Defaults for new frontend options in config.exs
|
2018-10-21 12:54:37 +01:00 |
|
scarlett
|
a253c1466e
|
New frontend options
|
2018-10-21 12:52:52 +01:00 |
|
eal
|
aaf3fc1575
|
Merge branch 'pleroma-list-belongs' into 'develop'
Pleroma list belongs
Closes #333
See merge request pleroma/pleroma!382
|
2018-10-20 10:14:08 +00:00 |
|
eal
|
5e9a0e2460
|
Fix some typos in the list test.
|
2018-10-20 13:03:45 +03:00 |
|
AkiraFukushima
|
a249cbf187
|
Add a test for List.get_lists_account_belongs
|
2018-10-19 21:24:15 +09:00 |
|
AkiraFukushima
|
e8c698af41
|
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
|
2018-10-19 01:46:26 +09:00 |
|
kaniini
|
ad3181895c
|
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
|
2018-10-18 14:36:40 +00:00 |
|
William Pitcock
|
595d855f0e
|
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
|
2018-10-18 14:29:31 +00:00 |
|
Haelwenn (lanodan) Monnier
|
2154c5dcd8
|
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
|
2018-10-18 07:58:15 +02:00 |
|
kaniini
|
6098070234
|
Merge branch 'bugfix/osada-mention' into 'develop'
fix osada mentions
Closes #324
See merge request pleroma/pleroma!380
|
2018-10-17 19:33:15 +00:00 |
|
William Pitcock
|
958c5e02e8
|
tests: add a testcase for matching osada users in the formatter
|
2018-10-17 19:27:05 +00:00 |
|
William Pitcock
|
582dbe5c8d
|
formatter: fix matching osada users
|
2018-10-17 19:15:20 +00:00 |
|
Haelwenn
|
c7140c67c7
|
Merge branch 'import-maybe-direct-follow' into 'develop'
Use maybe_direct_follow for follow imports
See merge request pleroma/pleroma!378
|
2018-10-17 04:24:13 +00:00 |
|