akkoma
5 years agoFix credo issues
rinpatch [Wed, 31 Jul 2019 11:20:34 +0000 (14:20 +0300)]
Fix credo issues

5 years agoMerge branch 'develop' into feature/hide-follows-remote
rinpatch [Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)]
Merge branch 'develop' into feature/hide-follows-remote

5 years agoMerge branch 'revert-83508418' into 'develop'
kaniini [Mon, 29 Jul 2019 19:42:35 +0000 (19:42 +0000)]
Merge branch 'revert-83508418' into 'develop'

Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505

5 years agoRevert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
kaniini [Mon, 29 Jul 2019 19:42:26 +0000 (19:42 +0000)]
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

This reverts merge request !1504

5 years agoMerge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
Haelwenn [Mon, 29 Jul 2019 19:24:14 +0000 (19:24 +0000)]
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'

markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504

5 years agomarkdown: clean up html generated by earmark
Ariadne Conill [Mon, 29 Jul 2019 19:09:58 +0000 (19:09 +0000)]
markdown: clean up html generated by earmark

5 years agoMerge branch 'refactor/use-constants' into 'develop'
lain [Mon, 29 Jul 2019 16:30:47 +0000 (16:30 +0000)]
Merge branch 'refactor/use-constants' into 'develop'

refactoring: begin to use constants

See merge request pleroma/pleroma!1500

5 years agoMerge branch 'mailer-enabled-nodeinfo' into 'develop'
kaniini [Mon, 29 Jul 2019 16:17:41 +0000 (16:17 +0000)]
Merge branch 'mailer-enabled-nodeinfo' into 'develop'

Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502

5 years agoAdd `mailerEnabled` to the NodeInfo metadata
Eugenij [Mon, 29 Jul 2019 16:17:40 +0000 (16:17 +0000)]
Add `mailerEnabled` to the NodeInfo metadata

5 years agoMerge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
kaniini [Mon, 29 Jul 2019 16:17:23 +0000 (16:17 +0000)]
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'

Redirect not logged-in users to the MastoFE login page on private instances

Closes #1045

See merge request pleroma/pleroma!1503

5 years agoRedirect not logged-in users to the MastoFE login page on private instances
Sergey Suprunenko [Mon, 29 Jul 2019 16:17:22 +0000 (16:17 +0000)]
Redirect not logged-in users to the MastoFE login page on private instances

5 years agoMerge branch 'tests/ostatus_controller' into 'develop'
kaniini [Mon, 29 Jul 2019 05:02:20 +0000 (05:02 +0000)]
Merge branch 'tests/ostatus_controller' into 'develop'

added tests for OstatusController

See merge request pleroma/pleroma!1501

5 years agoadded tests for OstatusController
Maksim [Mon, 29 Jul 2019 05:02:20 +0000 (05:02 +0000)]
added tests for OstatusController

5 years agoconstants: add as_public constant and use it everywhere
Ariadne Conill [Mon, 29 Jul 2019 02:43:19 +0000 (02:43 +0000)]
constants: add as_public constant and use it everywhere

5 years agomix: add ex_const dependency
Ariadne Conill [Mon, 29 Jul 2019 02:12:35 +0000 (02:12 +0000)]
mix: add ex_const dependency

5 years agoMerge branch 'bugfix/transmogrifier-fix-delete' into 'develop'
kaniini [Sun, 28 Jul 2019 21:40:55 +0000 (21:40 +0000)]
Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'

transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

See merge request pleroma/pleroma!1498

5 years agotransmogrifier: use User.delete() instead of handrolled user deletion code for remote...
Ariadne Conill [Sun, 28 Jul 2019 21:29:10 +0000 (21:29 +0000)]
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

5 years agoMerge branch 'confirmation-resend' into 'develop'
kaniini [Sun, 28 Jul 2019 20:30:10 +0000 (20:30 +0000)]
Merge branch 'confirmation-resend' into 'develop'

add account confirmation email resend in mastodon api

See merge request pleroma/pleroma!1492

5 years agoadd account confirmation email resend in mastodon api
Sachin Joshi [Sun, 28 Jul 2019 20:30:10 +0000 (20:30 +0000)]
add account confirmation email resend in mastodon api

5 years agoMerge branch 'fix/user_update_and_set_cache' into 'develop'
kaniini [Sun, 28 Jul 2019 20:29:27 +0000 (20:29 +0000)]
Merge branch 'fix/user_update_and_set_cache' into 'develop'

fixed User.update_and_set_cache for stale user

See merge request pleroma/pleroma!1493

5 years agofixed User.update_and_set_cache for stale user
Maksim [Sun, 28 Jul 2019 20:29:26 +0000 (20:29 +0000)]
fixed User.update_and_set_cache for stale user

5 years agoMerge branch 'develop' into 'develop'
kaniini [Sun, 28 Jul 2019 20:25:35 +0000 (20:25 +0000)]
Merge branch 'develop' into 'develop'

Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496

5 years agoMerge branch 'feature/hackney-303-redirect' into 'develop'
kaniini [Sun, 28 Jul 2019 20:24:39 +0000 (20:24 +0000)]
Merge branch 'feature/hackney-303-redirect' into 'develop'

Handle 303 redirects

Closes #1127

See merge request pleroma/pleroma!1497

5 years agoHandle 303 redirects
Sergey Suprunenko [Sun, 28 Jul 2019 20:24:39 +0000 (20:24 +0000)]
Handle 303 redirects

5 years agoFix HTTP sig tweak on KeyId
Thomas Sileo [Sun, 28 Jul 2019 12:17:56 +0000 (14:17 +0200)]
Fix HTTP sig tweak on KeyId

5 years agoMerge branch 'issue/1097' into 'develop'
rinpatch [Fri, 26 Jul 2019 20:27:38 +0000 (20:27 +0000)]
Merge branch 'issue/1097' into 'develop'

[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

See merge request pleroma/pleroma!1495

5 years ago[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
Maksim [Fri, 26 Jul 2019 20:27:38 +0000 (20:27 +0000)]
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

5 years agoMerge branch 'changelog/1484-base_url-remove-media' into 'develop'
Haelwenn [Fri, 26 Jul 2019 15:27:12 +0000 (15:27 +0000)]
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'

Changelog: !1484 base_url removed /media/

See merge request pleroma/pleroma!1494

5 years agoCHANGELOG.md: Add entry for !1484
Haelwenn (lanodan) Monnier [Fri, 26 Jul 2019 13:33:25 +0000 (15:33 +0200)]
CHANGELOG.md: Add entry for !1484

Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484

[ci skip]

5 years agoMerge branch 'develop' into feature/hide-follows-remote
rinpatch [Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)]
Merge branch 'develop' into feature/hide-follows-remote

5 years agoMerge branch 'tests/filter_dedupe' into 'develop'
kaniini [Thu, 25 Jul 2019 03:43:13 +0000 (03:43 +0000)]
Merge branch 'tests/filter_dedupe' into 'develop'

fixed test for elixir 1.7.4

See merge request pleroma/pleroma!1487

5 years agofixed test for elixir 1.7.4
Maksim [Thu, 25 Jul 2019 03:43:13 +0000 (03:43 +0000)]
fixed test for elixir 1.7.4

5 years agoMerge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
kaniini [Wed, 24 Jul 2019 19:29:01 +0000 (19:29 +0000)]
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'

Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472

5 years agoMerge branch 'fix/put-correct-activity-url' into 'develop'
kaniini [Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)]
Merge branch 'fix/put-correct-activity-url' into 'develop'

Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request pleroma/pleroma!1485

5 years agoShow the url advertised in the Activity in the Status JSON response
Sergey Suprunenko [Wed, 24 Jul 2019 19:28:21 +0000 (19:28 +0000)]
Show the url advertised in the Activity in the Status JSON response

5 years agoAdd WebFinger test for AP-only account
kPherox [Wed, 24 Jul 2019 16:27:34 +0000 (01:27 +0900)]
Add WebFinger test for AP-only account

5 years agoMerge branch 'fix/Upload_base_url' into 'develop'
kaniini [Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)]
Merge branch 'fix/Upload_base_url' into 'develop'

Fix/upload base url

See merge request pleroma/pleroma!1484

5 years agoDo not prepend /media/ when using base_url
feld [Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)]
Do not prepend /media/ when using base_url

This ensures admin has full control over the path where media resides.

5 years agoChange to not require `magic-public-key` on WebFinger
kPherox [Wed, 24 Jul 2019 14:38:38 +0000 (23:38 +0900)]
Change to not require `magic-public-key` on WebFinger

5 years agoMerge branch 'tests/web_finger' into 'develop'
kaniini [Wed, 24 Jul 2019 15:13:11 +0000 (15:13 +0000)]
Merge branch 'tests/web_finger' into 'develop'

tests WebFinger

See merge request pleroma/pleroma!1483

5 years agotests WebFinger
Maksim [Wed, 24 Jul 2019 15:13:10 +0000 (15:13 +0000)]
tests WebFinger

5 years agoMerge branch 'domain-blocking-relationship-api' into 'develop'
kaniini [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Merge branch 'domain-blocking-relationship-api' into 'develop'

Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)

See merge request pleroma/pleroma!1481

5 years agoAdd `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
Eugenij [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)

5 years agoMerge branch 'develop' into 'develop'
lain [Wed, 24 Jul 2019 11:28:05 +0000 (11:28 +0000)]
Merge branch 'develop' into 'develop'

Honour domain blocks on streamed notifications/statuses

See merge request pleroma/pleroma!1482

5 years agocheck both item and parent domain blocks
sadposter [Wed, 24 Jul 2019 10:35:16 +0000 (11:35 +0100)]
check both item and parent domain blocks

5 years agomove domain block check to with block
Sadposter [Wed, 24 Jul 2019 10:11:33 +0000 (11:11 +0100)]
move domain block check to with block

5 years agohonour domain blocks on streaming notifications
Sadposter [Wed, 24 Jul 2019 10:09:06 +0000 (11:09 +0100)]
honour domain blocks on streaming notifications

5 years agoMerge branch 'Fix-static-dir-doc' into 'develop'
kaniini [Wed, 24 Jul 2019 01:59:41 +0000 (01:59 +0000)]
Merge branch 'Fix-static-dir-doc' into 'develop'

Fix static_dir docs

See merge request pleroma/pleroma!1465

5 years agoAdd text about gitignore
aries [Wed, 24 Jul 2019 01:50:56 +0000 (01:50 +0000)]
Add text about gitignore

5 years agoMerge branch 'feature/admin-api-user-statuses' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:21 +0000 (23:59 +0000)]
Merge branch 'feature/admin-api-user-statuses' into 'develop'

Admin API: Endpoint for fetching latest user's statuses

See merge request pleroma/pleroma!1413

5 years agoMerge branch 'bugfix/rich-media-splice-url' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)]
Merge branch 'bugfix/rich-media-splice-url' into 'develop'

rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480

5 years agorich media: parser: splice the given URL into the result
Ariadne Conill [Tue, 23 Jul 2019 22:58:31 +0000 (22:58 +0000)]
rich media: parser: splice the given URL into the result

5 years agoMerge branch 'develop' into feature/admin-api-user-statuses
Maxim Filippov [Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses

5 years agoAdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private...
Maxim Filippov [Tue, 23 Jul 2019 22:50:09 +0000 (01:50 +0300)]
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)

5 years agoMerge branch 'chore/update-mix-lock' into 'develop'
kaniini [Tue, 23 Jul 2019 19:59:15 +0000 (19:59 +0000)]
Merge branch 'chore/update-mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!1478

5 years agoupdate mix.lock
Ariadne Conill [Tue, 23 Jul 2019 19:49:36 +0000 (19:49 +0000)]
update mix.lock

5 years agoMerge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
kaniini [Tue, 23 Jul 2019 19:48:34 +0000 (19:48 +0000)]
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'

Router: Remove deprecated AdminAPI endpoints

See merge request pleroma/pleroma!1466

5 years agoRouter: Remove deprecated AdminAPI endpoints
Haelwenn (lanodan) Monnier [Mon, 22 Jul 2019 11:41:56 +0000 (13:41 +0200)]
Router: Remove deprecated AdminAPI endpoints

5 years agoMerge branch 'admin-config-fix' into 'develop'
kaniini [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Merge branch 'admin-config-fix' into 'develop'

Admin config fix

See merge request pleroma/pleroma!1471

5 years agoAdmin config fix
Alexander Strizhakov [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Admin config fix

5 years agoMerge branch 'tests/activity_pub_publisher' into 'develop'
kaniini [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
Merge branch 'tests/activity_pub_publisher' into 'develop'

tests for Pleroma.Web.ActivityPub.Publisher

See merge request pleroma/pleroma!1473

5 years agotests for Pleroma.Web.ActivityPub.Publisher
Maksim [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
tests for Pleroma.Web.ActivityPub.Publisher

5 years agoMerge branch 'bugfix/unauthed-liked-by' into 'develop'
kaniini [Tue, 23 Jul 2019 19:14:43 +0000 (19:14 +0000)]
Merge branch 'bugfix/unauthed-liked-by' into 'develop'

Bugfix: don't error out on unauthorized request to liked/favourited_by

See merge request pleroma/pleroma!1474

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Tue, 23 Jul 2019 19:14:16 +0000 (19:14 +0000)]
Merge branch 'patch-2' into 'develop'

Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

Closes #1050

See merge request pleroma/pleroma!1475

5 years agoMerge branch 'fix/subscriber-notifications' into 'develop'
kaniini [Tue, 23 Jul 2019 19:13:55 +0000 (19:13 +0000)]
Merge branch 'fix/subscriber-notifications' into 'develop'

Do not notify subscribers for messages from users which are replies to others

See merge request pleroma/pleroma!1477

5 years agoFix test
Mark Felder [Tue, 23 Jul 2019 18:57:22 +0000 (13:57 -0500)]
Fix test

5 years agoFix function
Mark Felder [Tue, 23 Jul 2019 18:53:05 +0000 (13:53 -0500)]
Fix function

5 years agomove unauth'd user blocks?/2 check
Sadposter [Tue, 23 Jul 2019 18:44:47 +0000 (19:44 +0100)]
move unauth'd user blocks?/2 check

5 years agoMerge branch 'bugfix/http-signatures-misskey' into 'develop'
Haelwenn [Tue, 23 Jul 2019 18:39:01 +0000 (18:39 +0000)]
Merge branch 'bugfix/http-signatures-misskey' into 'develop'

signature: properly deduce the actor from misskey key IDs

See merge request pleroma/pleroma!1476

5 years agoDo not notify subscribers for messages from users which are replies to others
Mark Felder [Tue, 23 Jul 2019 18:14:26 +0000 (13:14 -0500)]
Do not notify subscribers for messages from users which are replies to others

5 years agosignature: properly deduce the actor from misskey key IDs
Ariadne Conill [Tue, 23 Jul 2019 16:47:22 +0000 (16:47 +0000)]
signature: properly deduce the actor from misskey key IDs

5 years agoUpdate `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
oncletom [Tue, 23 Jul 2019 15:16:47 +0000 (15:16 +0000)]
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

5 years agofix test names because i cannot type
Sadposter [Tue, 23 Jul 2019 14:47:17 +0000 (15:47 +0100)]
fix test names because i cannot type

5 years agoactually reblog on the reblog test
Sadposter [Tue, 23 Jul 2019 14:38:19 +0000 (15:38 +0100)]
actually reblog on the reblog test

5 years agoUse correct URL for tests
Sadposter [Tue, 23 Jul 2019 14:31:35 +0000 (15:31 +0100)]
Use correct URL for tests

5 years agoMix format
Sadposter [Tue, 23 Jul 2019 14:13:05 +0000 (15:13 +0100)]
Mix format

5 years agoadd tests for unauthed reqs to liked/reblogged_by
Sadposter [Tue, 23 Jul 2019 14:05:19 +0000 (15:05 +0100)]
add tests for unauthed reqs to liked/reblogged_by

5 years agofix unauthenticated req to favourited/rebloggd_by
Sadposter [Tue, 23 Jul 2019 14:02:18 +0000 (15:02 +0100)]
fix unauthenticated req to favourited/rebloggd_by

5 years agoUse User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
kPherox [Tue, 23 Jul 2019 09:45:04 +0000 (18:45 +0900)]
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1

5 years agoremove pry
Maxim Filippov [Tue, 23 Jul 2019 09:30:37 +0000 (12:30 +0300)]
remove pry

5 years agoFix the sentence and add the setting example
Aries [Tue, 23 Jul 2019 00:55:58 +0000 (09:55 +0900)]
Fix the sentence and add the setting example

5 years agoMerge branch 'tests/skip-some-tests-on-mac' into 'develop'
kaniini [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'

Exclude tests that use :crypt.crypt/2 on macOS

See merge request pleroma/pleroma!1470

5 years agoExclude tests that use :crypt.crypt/2 on macOS
Sergey Suprunenko [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
Exclude tests that use :crypt.crypt/2 on macOS

5 years agoMerge branch 'changelog' into 'develop'
kaniini [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
Merge branch 'changelog' into 'develop'

changelog

See merge request pleroma/pleroma!1469

5 years agochangelog
Alexander Strizhakov [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
changelog

5 years agoMerge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
kaniini [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'

Feature/1087 wildcard option for blocks

Closes #1087

See merge request pleroma/pleroma!1467

5 years agoFeature/1087 wildcard option for blocks
Alexander Strizhakov [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Feature/1087 wildcard option for blocks

5 years agoMerge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
Haelwenn [Mon, 22 Jul 2019 11:01:35 +0000 (11:01 +0000)]
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'

activitypub: publisher: align sharedinbox usage with AP specification rules

See merge request pleroma/pleroma!1464

5 years agoFix static_dir docs
aries [Mon, 22 Jul 2019 09:46:32 +0000 (18:46 +0900)]
Fix static_dir docs

5 years agoMerge branch 'bugfix/muted-user-notif-streaming' into 'develop'
kaniini [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'

Bugfix: muted/blocked user notification streaming

Closes #1105

See merge request pleroma/pleroma!1461

5 years agoBugfix: muted/blocked user notification streaming
Sadposter [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Bugfix: muted/blocked user notification streaming

5 years agoMerge branch 'tests/improve-test-coverage' into 'develop'
kaniini [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Merge branch 'tests/improve-test-coverage' into 'develop'

Add tests for users tasks and PleromaAuthenticator

See merge request pleroma/pleroma!1462

5 years agoAdd tests for users tasks and PleromaAuthenticator
Sergey Suprunenko [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Add tests for users tasks and PleromaAuthenticator

5 years agoMerge branch 'hide-blocked-from-interaction' into 'develop'
kaniini [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Merge branch 'hide-blocked-from-interaction' into 'develop'

Hide blocked users from interactions

See merge request pleroma/pleroma!1463

5 years agoHide blocked users from interactions
Sadposter [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Hide blocked users from interactions

5 years agoactivitypub: publisher: align sharedinbox usage with AP specification rules
Ariadne Conill [Mon, 22 Jul 2019 02:18:45 +0000 (02:18 +0000)]
activitypub: publisher: align sharedinbox usage with AP specification rules

While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.

5 years agoMerge branch 'fix/rich-media-ttl-fallback' into 'develop'
kaniini [Sun, 21 Jul 2019 16:05:58 +0000 (16:05 +0000)]
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'

Fix rich media parser failing when no TTL can be found by image TTL setters

See merge request pleroma/pleroma!1460

5 years agoFix rich media parser failing when no TTL can be found by image TTL
rinpatch [Sun, 21 Jul 2019 15:22:22 +0000 (18:22 +0300)]
Fix rich media parser failing when no TTL can be found by image TTL
setters

5 years agoMerge branch 'bugfix/sharedinbox-path-first' into 'develop'
kaniini [Sun, 21 Jul 2019 04:18:12 +0000 (04:18 +0000)]
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'

router: ensure the AP sharedinbox path is registered first

See merge request pleroma/pleroma!1458

5 years agorouter: ensure the AP sharedinbox path is registered first
Ariadne Conill [Sun, 21 Jul 2019 03:52:06 +0000 (03:52 +0000)]
router: ensure the AP sharedinbox path is registered first