akkoma
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 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

5 years agoMerge branch '1112-user-insert-conflict-id-preservation' into 'develop'
kaniini [Sat, 20 Jul 2019 13:09:38 +0000 (13:09 +0000)]
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'

[#1112] Preserving `id` on user insert conflict

Closes #1112

See merge request pleroma/pleroma!1456

5 years agoMerge branch 'tests/mock-sha512-crypt' into 'develop'
kaniini [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
Merge branch 'tests/mock-sha512-crypt' into 'develop'

[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest

Closes #1114

See merge request pleroma/pleroma!1455

5 years ago[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Sergey Suprunenko [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest

5 years ago[#1112] Preserving `id` on user insert conflict on order not to violate conversation_...
Ivan Tashkinov [Sat, 20 Jul 2019 10:03:34 +0000 (13:03 +0300)]
[#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.

5 years agoMerge branch 'feature/matstodon-statuses-by-name' into 'develop'
feld [Fri, 19 Jul 2019 21:59:18 +0000 (21:59 +0000)]
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'

Feature/matstodon statuses by name

See merge request pleroma/pleroma!1211

5 years agoMerge branch 'develop' into feature/matstodon-statuses-by-name
Mark Felder [Fri, 19 Jul 2019 21:55:10 +0000 (16:55 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name

5 years agoMerge branch 'feature/richmedia-ttl' into 'develop'
kaniini [Fri, 19 Jul 2019 21:36:36 +0000 (21:36 +0000)]
Merge branch 'feature/richmedia-ttl' into 'develop'

add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438

5 years agoMerge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
kaniini [Fri, 19 Jul 2019 19:33:47 +0000 (19:33 +0000)]
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'

mix: add pleroma.user unsubscribe_all_from_instance

See merge request pleroma/pleroma!1454

5 years agomix: add pleroma.user unsubscribe_all_from_instance
Ariadne Conill [Fri, 19 Jul 2019 19:11:04 +0000 (19:11 +0000)]
mix: add pleroma.user unsubscribe_all_from_instance

5 years agoMerge branch 'refactor/http-signature-plug' into 'develop'
kaniini [Fri, 19 Jul 2019 16:57:24 +0000 (16:57 +0000)]
Merge branch 'refactor/http-signature-plug' into 'develop'

http signature plug: separation of concerns

See merge request pleroma/pleroma!1449

5 years agoMerge branch 'issue/1110' into 'develop'
kaniini [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
Merge branch 'issue/1110' into 'develop'

#1110 fixed /api/pleroma/healthcheck

Closes #1110

See merge request pleroma/pleroma!1453

5 years ago#1110 fixed /api/pleroma/healthcheck
Maksim [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
#1110 fixed /api/pleroma/healthcheck

5 years agoMerge branch 'patch-2' into 'develop'
rinpatch [Fri, 19 Jul 2019 10:15:16 +0000 (10:15 +0000)]
Merge branch 'patch-2' into 'develop'

Update clients.md for Fedilab

See merge request pleroma/pleroma!1452

5 years agoFix domain for the contact clients.md
tom79 [Fri, 19 Jul 2019 08:40:47 +0000 (08:40 +0000)]
Fix domain for the contact clients.md

5 years agoUpdate clients.md for Fedilab
tom79 [Fri, 19 Jul 2019 08:39:22 +0000 (08:39 +0000)]
Update clients.md for Fedilab
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features

5 years agoupdate the docs
Sachin Joshi [Fri, 19 Jul 2019 06:05:47 +0000 (11:50 +0545)]
update the docs

5 years agochange the structure of image ttl parsar
Sachin Joshi [Fri, 19 Jul 2019 05:58:42 +0000 (11:43 +0545)]
change the structure of image ttl parsar

5 years agomapped signature plug: use `user` assign like authentication plug
Ariadne Conill [Thu, 18 Jul 2019 20:31:25 +0000 (20:31 +0000)]
mapped signature plug: use `user` assign like authentication plug

5 years agoMerge branch 'tests/authentication_plug' into 'develop'
kaniini [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
Merge branch 'tests/authentication_plug' into 'develop'

tests for Plugs.AuthenticationPlug

See merge request pleroma/pleroma!1450

5 years agotests for Plugs.AuthenticationPlug
Maksim [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
tests for Plugs.AuthenticationPlug

5 years agotests: add tests for mapped signature plug
Ariadne Conill [Thu, 18 Jul 2019 16:28:36 +0000 (16:28 +0000)]
tests: add tests for mapped signature plug

5 years agomapped signature plug: fix user lookup
Ariadne Conill [Thu, 18 Jul 2019 16:27:50 +0000 (16:27 +0000)]
mapped signature plug: fix user lookup

5 years agomapped signature plug: don't invalidate in cases where a signature is actually not...
Ariadne Conill [Thu, 18 Jul 2019 16:01:21 +0000 (16:01 +0000)]
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)

5 years agomix: update http signatures dependency
Ariadne Conill [Thu, 18 Jul 2019 15:51:58 +0000 (15:51 +0000)]
mix: update http signatures dependency

5 years agoplugs: add MappedSignatureToIdentityPlug
Ariadne Conill [Thu, 18 Jul 2019 15:38:45 +0000 (15:38 +0000)]
plugs: add MappedSignatureToIdentityPlug

5 years agosignature: make key_id_to_actor_id() public
Ariadne Conill [Thu, 18 Jul 2019 15:35:42 +0000 (15:35 +0000)]
signature: make key_id_to_actor_id() public

5 years agohttp signature plug: remove redundant checks handled by HTTPSignatures library
Ariadne Conill [Thu, 18 Jul 2019 15:06:58 +0000 (15:06 +0000)]
http signature plug: remove redundant checks handled by HTTPSignatures library

the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests.  but now, the adapter has been corrected.

5 years agoMerge branch 'feature/signed-object-fetches' into 'develop'
kaniini [Thu, 18 Jul 2019 13:27:50 +0000 (13:27 +0000)]
Merge branch 'feature/signed-object-fetches' into 'develop'

signed object fetches

See merge request pleroma/pleroma!1446

5 years agoMerge branch 'tests/uploads' into 'develop'
kaniini [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
Merge branch 'tests/uploads' into 'develop'

tests for Uploader with webhook

See merge request pleroma/pleroma!1447

5 years agotests for Uploader with webhook
Maksim [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
tests for Uploader with webhook

5 years agoMerge branch 'fix-howto_mediaproxy' into 'develop'
kaniini [Thu, 18 Jul 2019 12:29:26 +0000 (12:29 +0000)]
Merge branch 'fix-howto_mediaproxy' into 'develop'

Fix media proxy doc redirect setting not working

See merge request pleroma/pleroma!1448

5 years agoFix redirect setting not working
aries [Thu, 18 Jul 2019 12:08:31 +0000 (21:08 +0900)]
Fix redirect setting not working

5 years agoupdate changelog
Ariadne Conill [Wed, 17 Jul 2019 23:07:53 +0000 (23:07 +0000)]
update changelog

5 years agotests: add tests for signed object fetches
Ariadne Conill [Wed, 17 Jul 2019 22:58:52 +0000 (22:58 +0000)]
tests: add tests for signed object fetches

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Merge branch 'patch-2' into 'develop'

Update clients.md - added Homepage for Fedilab Android app

See merge request pleroma/pleroma!1444

5 years agoUpdate clients.md - added Homepage for Fedilab Android app
tallship [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Update clients.md - added Homepage for Fedilab Android app

5 years agoMerge branch 'patch-3' into 'develop'
kaniini [Wed, 17 Jul 2019 23:03:30 +0000 (23:03 +0000)]
Merge branch 'patch-3' into 'develop'

Update otp_en.md - Added creation of initial admin user

See merge request pleroma/pleroma!1445

5 years agofetcher: sign object fetches if configured
Ariadne Conill [Wed, 17 Jul 2019 22:41:42 +0000 (22:41 +0000)]
fetcher: sign object fetches if configured

5 years agoUpdate otp_en.md - Added creation of initial admin user
Bradley D. Thornton [Wed, 17 Jul 2019 22:35:16 +0000 (22:35 +0000)]
Update otp_en.md - Added creation of initial admin user

5 years agoconfig: add sign_object_fetches option
Ariadne Conill [Wed, 17 Jul 2019 21:38:06 +0000 (21:38 +0000)]
config: add sign_object_fetches option

5 years agoMerge branch 'feature/instance-fetch-actor' into 'develop'
kaniini [Wed, 17 Jul 2019 19:45:40 +0000 (19:45 +0000)]
Merge branch 'feature/instance-fetch-actor' into 'develop'

instance fetch service actor

See merge request pleroma/pleroma!1440

5 years agoMerge branch 'feature/http-signatures-keyid' into 'develop'
kaniini [Wed, 17 Jul 2019 19:44:14 +0000 (19:44 +0000)]
Merge branch 'feature/http-signatures-keyid' into 'develop'

http signatures: derive actor from key IDs

See merge request pleroma/pleroma!1442

5 years agohttp signatures: derive actor ID from key ID.
Ariadne Conill [Wed, 17 Jul 2019 19:18:19 +0000 (19:18 +0000)]
http signatures: derive actor ID from key ID.

Almost all AP servers return their key ID as the actor URI with #main-key
added.  Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.

5 years agomix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
Ariadne Conill [Wed, 17 Jul 2019 19:00:26 +0000 (19:00 +0000)]
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989

5 years agoMerge branch 'password-reset-fix-for-non-test-env' into 'develop'
kaniini [Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)]
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'

Fix password reset for non-test env

See merge request pleroma/pleroma!1441

5 years agoFix password reset for non-test env
Eugenij [Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)]
Fix password reset for non-test env

Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.

Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.

5 years agoupdate changelog
Ariadne Conill [Wed, 17 Jul 2019 17:49:21 +0000 (17:49 +0000)]
update changelog

5 years agotests: add test for fetching the internal fetch actor
Ariadne Conill [Wed, 17 Jul 2019 17:48:08 +0000 (17:48 +0000)]
tests: add test for fetching the internal fetch actor

5 years agoactivitypub: represent internal fetch actor
Ariadne Conill [Wed, 17 Jul 2019 17:34:57 +0000 (17:34 +0000)]
activitypub: represent internal fetch actor

5 years agoactivitypub: introduce internal fetch service actor
Ariadne Conill [Wed, 17 Jul 2019 17:14:08 +0000 (17:14 +0000)]
activitypub: introduce internal fetch service actor

5 years agouser: add is_internal_user? helper function
Ariadne Conill [Wed, 17 Jul 2019 17:12:42 +0000 (17:12 +0000)]
user: add is_internal_user? helper function

5 years agowebfinger: allow resolution of usernames with dots in them (internal actors)
Ariadne Conill [Wed, 17 Jul 2019 16:59:29 +0000 (16:59 +0000)]
webfinger: allow resolution of usernames with dots in them (internal actors)

5 years agoactivitypub: controller: rework the way the relay actor is presented so the code...
Ariadne Conill [Wed, 17 Jul 2019 16:22:57 +0000 (16:22 +0000)]
activitypub: controller: rework the way the relay actor is presented so the code can be reused

5 years agouser: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
Ariadne Conill [Wed, 17 Jul 2019 15:48:51 +0000 (15:48 +0000)]
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()

5 years agoMerge branch 'feature/mention-mrf' into 'develop'
kaniini [Wed, 17 Jul 2019 15:28:41 +0000 (15:28 +0000)]
Merge branch 'feature/mention-mrf' into 'develop'

Add MRF MentionPolicy for dropping posts which mention specific actors

See merge request pleroma/pleroma!1439

5 years agoAdd MRF MentionPolicy for dropping posts which mention specific actors
RX14 [Wed, 17 Jul 2019 13:55:47 +0000 (14:55 +0100)]
Add MRF MentionPolicy for dropping posts which mention specific actors

5 years agoMerge branch 'feature/1078-password-reset' into 'develop'
kaniini [Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)]
Merge branch 'feature/1078-password-reset' into 'develop'

Feature/1078 password reset

Closes #1078

See merge request pleroma/pleroma!1431

5 years agomastoapi password reset
Alexander Strizhakov [Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)]
mastoapi password reset

added rate limit to password reset

configure rate limit in runtime

5 years agoMerge branch 'tests/upload_filters' into 'develop'
kaniini [Tue, 16 Jul 2019 21:35:43 +0000 (21:35 +0000)]
Merge branch 'tests/upload_filters' into 'develop'

added tests for Pleroma.Upload.Filter

See merge request pleroma/pleroma!1434

5 years agoadded tests for Pleroma.Upload.Filter
Maksim [Tue, 16 Jul 2019 21:35:43 +0000 (21:35 +0000)]
added tests for Pleroma.Upload.Filter

5 years agoMerge branch '1094-relation-actions-rate-limiting' into 'develop'
kaniini [Tue, 16 Jul 2019 21:35:12 +0000 (21:35 +0000)]
Merge branch '1094-relation-actions-rate-limiting' into 'develop'

[#1094] Rate-limited follow & unfollow actions.

Closes #1094

See merge request pleroma/pleroma!1436

5 years agoadd the rich media ttl based on image exp time
Sachin Joshi [Tue, 16 Jul 2019 16:52:36 +0000 (22:37 +0545)]
add the rich media ttl based on image exp time

5 years agoApply suggestion to docs/config.md
Ivan Tashkinov [Tue, 16 Jul 2019 16:59:02 +0000 (16:59 +0000)]
Apply suggestion to docs/config.md

5 years ago[#1094] Rate-limited follow & unfollow actions.
Ivan Tashkinov [Tue, 16 Jul 2019 16:18:30 +0000 (19:18 +0300)]
[#1094] Rate-limited follow & unfollow actions.

5 years agoMerge branch 'add-deactivated-to-account-view' into 'develop'
kaniini [Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)]
Merge branch 'add-deactivated-to-account-view' into 'develop'

Add `pleroma.deactivated` to the Account entity (Mastodon API)

See merge request pleroma/pleroma!1433

5 years agoAdd `pleroma.deactivated` to the Account entity (Mastodon API)
Eugenij [Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)]
Add `pleroma.deactivated` to the Account entity (Mastodon API)

5 years agoMerge branch 'add-blocked-by-to-relationship' into 'develop'
kaniini [Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)]
Merge branch 'add-blocked-by-to-relationship' into 'develop'

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

See merge request pleroma/pleroma!1429

5 years agoAdd the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relatio...
Eugenij [Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)]
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)

5 years agoMerge branch 'feature/addressable-lists' into 'develop'
kaniini [Tue, 16 Jul 2019 10:49:24 +0000 (10:49 +0000)]
Merge branch 'feature/addressable-lists' into 'develop'

Fix typo

See merge request pleroma/pleroma!1432

5 years agoFix typo
Egor Kislitsyn [Tue, 16 Jul 2019 07:56:07 +0000 (14:56 +0700)]
Fix typo

5 years agoMerge branch 'bugfix/poll-id-as-string' into 'develop'
rinpatch [Tue, 16 Jul 2019 06:06:22 +0000 (06:06 +0000)]
Merge branch 'bugfix/poll-id-as-string' into 'develop'

Status View: Poll ids are strings.

See merge request pleroma/pleroma!1430

5 years agoMastodon Controller: Fix tests.
lain [Tue, 16 Jul 2019 05:01:18 +0000 (14:01 +0900)]
Mastodon Controller: Fix tests.

5 years agoStatus View: Poll ids are strings.
lain [Tue, 16 Jul 2019 03:47:40 +0000 (12:47 +0900)]
Status View: Poll ids are strings.

All ids in mastodon are strings, in general.

5 years agoAdd changelog entry for Mastodon API change
Mark Felder [Mon, 15 Jul 2019 22:10:33 +0000 (17:10 -0500)]
Add changelog entry for Mastodon API change

5 years agoMerge branch 'develop' into feature/matstodon-statuses-by-name
Mark Felder [Mon, 15 Jul 2019 22:10:27 +0000 (17:10 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name

5 years agoMerge branch 'match-file-name' into 'develop'
feld [Mon, 15 Jul 2019 22:04:58 +0000 (22:04 +0000)]
Merge branch 'match-file-name' into 'develop'

try to always match the filename for proxy url

See merge request pleroma/pleroma!1405

5 years agoMerge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'
feld [Mon, 15 Jul 2019 21:43:04 +0000 (21:43 +0000)]
Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'

Remove dead link from the installation docs

See merge request pleroma/pleroma!1428

5 years agoRemove dead link from the installation docs
Eugenij [Mon, 15 Jul 2019 21:43:04 +0000 (21:43 +0000)]
Remove dead link from the installation docs

5 years agoMerge branch 'tests/mastodon-common-api' into 'develop'
kaniini [Mon, 15 Jul 2019 19:47:23 +0000 (19:47 +0000)]
Merge branch 'tests/mastodon-common-api' into 'develop'

Add more tests for MastodonAPIController and CommonAPI

See merge request pleroma/pleroma!1425

5 years agoAdd more tests for MastodonAPIController and CommonAPI
Sergey Suprunenko [Mon, 15 Jul 2019 19:47:23 +0000 (19:47 +0000)]
Add more tests for MastodonAPIController and CommonAPI

5 years agoMerge branch 'fix/1091-notifications-query' into 'develop'
kaniini [Mon, 15 Jul 2019 19:46:31 +0000 (19:46 +0000)]
Merge branch 'fix/1091-notifications-query' into 'develop'

Notifications query fix

Closes #1091

See merge request pleroma/pleroma!1427

5 years agoquery fix
Alex S [Mon, 15 Jul 2019 17:53:07 +0000 (20:53 +0300)]
query fix