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

5 years agoMerge branch 'sha512-crypt' into 'develop'
kaniini [Mon, 15 Jul 2019 16:13:17 +0000 (16:13 +0000)]
Merge branch 'sha512-crypt' into 'develop'

detect and use sha512-crypt for stored password hash.

See merge request pleroma/pleroma!1422

5 years agoMerge branch 'develop' into match-file-name
Sachin Joshi [Mon, 15 Jul 2019 15:45:56 +0000 (21:30 +0545)]
Merge branch 'develop' into match-file-name

# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex

5 years agoformatting
Moonman [Mon, 15 Jul 2019 15:36:51 +0000 (08:36 -0700)]
formatting

5 years agoMerge branch 'update-tzdata' into 'develop'
kaniini [Mon, 15 Jul 2019 13:02:59 +0000 (13:02 +0000)]
Merge branch 'update-tzdata' into 'develop'

Dependencies: Update tzdata and related packages.

See merge request pleroma/pleroma!1423

5 years agoMerge branch 'admin-configure-atom-keys' into 'develop'
kaniini [Mon, 15 Jul 2019 13:01:58 +0000 (13:01 +0000)]
Merge branch 'admin-configure-atom-keys' into 'develop'

admin configure - atom keys with leading :

See merge request pleroma/pleroma!1424

5 years agoMerge branch 'tests/http_signature' into 'develop'
kaniini [Mon, 15 Jul 2019 13:01:22 +0000 (13:01 +0000)]
Merge branch 'tests/http_signature' into 'develop'

tests for Pleroma.Signature

See merge request pleroma/pleroma!1426

5 years agotests for Pleroma.Signature
Maksim [Mon, 15 Jul 2019 13:01:22 +0000 (13:01 +0000)]
tests for Pleroma.Signature

5 years agoMerge branch 'feature/addressable-lists' into 'develop'
kaniini [Mon, 15 Jul 2019 13:00:33 +0000 (13:00 +0000)]
Merge branch 'feature/addressable-lists' into 'develop'

[#802] Add addressable lists

See merge request pleroma/pleroma!1113

5 years agomigrating task refactor
Alex S [Mon, 15 Jul 2019 12:45:27 +0000 (15:45 +0300)]
migrating task refactor

5 years agoatom keys with leading :
Alex S [Mon, 15 Jul 2019 08:00:55 +0000 (11:00 +0300)]
atom keys with leading :

5 years agoList messages must be visible for mentioned users
Egor Kislitsyn [Mon, 15 Jul 2019 07:54:40 +0000 (14:54 +0700)]
List messages must be visible for mentioned users

5 years agoDependencies: Update tzdata and related packages.
lain [Mon, 15 Jul 2019 07:47:39 +0000 (16:47 +0900)]
Dependencies: Update tzdata and related packages.

5 years agoAdd `listMessage` to to the JSON-LD context
Egor Kislitsyn [Mon, 15 Jul 2019 07:29:13 +0000 (14:29 +0700)]
Add `listMessage` to to the JSON-LD context

5 years agoUpdate documentation
Egor Kislitsyn [Mon, 15 Jul 2019 07:27:56 +0000 (14:27 +0700)]
Update documentation

5 years agoAdd an explanation comment to Publisher.publish/2
Egor Kislitsyn [Mon, 15 Jul 2019 07:20:31 +0000 (14:20 +0700)]
Add an explanation comment to Publisher.publish/2

5 years agoMerge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Egor Kislitsyn [Mon, 15 Jul 2019 07:11:54 +0000 (14:11 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

5 years agoSupport `list` visibility in StatusView
Egor Kislitsyn [Mon, 15 Jul 2019 07:00:29 +0000 (14:00 +0700)]
Support `list` visibility in StatusView

5 years agoMerge branch 'tests/media_proxy' into 'develop'
kaniini [Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)]
Merge branch 'tests/media_proxy' into 'develop'

added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418

5 years agoadded tests for Web.MediaProxy
Maksim [Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)]
added tests for Web.MediaProxy

5 years agoMerge branch 'feature/unsubscribe-on-unfollow' into 'develop'
kaniini [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'

Unfollow should also unsubscribe

Closes #1086

See merge request pleroma/pleroma!1419

5 years agoUnfollow should also unsubscribe
Sergey Suprunenko [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Unfollow should also unsubscribe

5 years agoMerge branch 'security/ir-generic-containment' into 'develop'
kaniini [Sun, 14 Jul 2019 19:24:39 +0000 (19:24 +0000)]
Merge branch 'security/ir-generic-containment' into 'develop'

security: IR-based generic object containment

See merge request pleroma/pleroma!1417

5 years agotests: fix object containment violations in the transmogrifier tests
Ariadne Conill [Sun, 14 Jul 2019 17:49:12 +0000 (17:49 +0000)]
tests: fix object containment violations in the transmogrifier tests

Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace.

5 years agosecurity: detect object containment violations at the IR level
Ariadne Conill [Sun, 14 Jul 2019 17:47:08 +0000 (17:47 +0000)]
security: detect object containment violations at the IR level

It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.

Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.

5 years agodetect and use sha512-crypt for stored password hash.
Moonman [Sun, 14 Jul 2019 16:48:42 +0000 (09:48 -0700)]
detect and use sha512-crypt for stored password hash.

5 years agoMerge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
kaniini [Sun, 14 Jul 2019 16:43:55 +0000 (16:43 +0000)]
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'

remove CC-BY-NC-ND license.

See merge request pleroma/pleroma!1415

5 years agoremove CC-BY-NC-ND license.
Ariadne Conill [Sun, 14 Jul 2019 16:43:00 +0000 (16:43 +0000)]
remove CC-BY-NC-ND license.

we moved branding assets (mascot etc) to CC-BY-SA a while back.

5 years agoMerge branch 'bugfix/llal-object-containment' into 'develop'
kaniini [Sun, 14 Jul 2019 16:39:17 +0000 (16:39 +0000)]
Merge branch 'bugfix/llal-object-containment' into 'develop'

Object.Fetcher: Handle error on Containment.contain_origin/2

See merge request pleroma/pleroma!1414

5 years agoObject.Fetcher: Keep the with-do block as per kaniini proposition
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 15:28:25 +0000 (17:28 +0200)]
Object.Fetcher: Keep the with-do block as per kaniini proposition

5 years agoFetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 12:24:56 +0000 (14:24 +0200)]
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)

5 years agoObject.Fetcher: Fallback to OStatus only if AP actually fails
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:13:11 +0000 (12:13 +0200)]
Object.Fetcher: Fallback to OStatus only if AP actually fails

5 years agoMerge branch 'feature/1072-muting-notifications' into 'develop'
kaniini [Sun, 14 Jul 2019 13:29:32 +0000 (13:29 +0000)]
Merge branch 'feature/1072-muting-notifications' into 'develop'

Feature/1072 muting notifications

Closes #1072

See merge request pleroma/pleroma!1398

5 years agoFeature/1072 muting notifications
Alexander Strizhakov [Sun, 14 Jul 2019 13:29:31 +0000 (13:29 +0000)]
Feature/1072 muting notifications

5 years agoObject.Fetcher: Handle error on Containment.contain_origin/2
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:02:16 +0000 (12:02 +0200)]
Object.Fetcher: Handle error on Containment.contain_origin/2

5 years agoHttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:39:05 +0000 (13:39 +0200)]
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site

5 years agoHttpRequestMock: Add missing mocks for object containment tests
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:31:43 +0000 (13:31 +0200)]
HttpRequestMock: Add missing mocks for object containment tests

5 years agoMerge branch 'rich_media_parsers_configurable' into 'develop'
kaniini [Sun, 14 Jul 2019 09:53:42 +0000 (09:53 +0000)]
Merge branch 'rich_media_parsers_configurable' into 'develop'

parsers configurable

See merge request pleroma/pleroma!1400

5 years agochangelog & docs
Alex S [Sun, 14 Jul 2019 06:20:54 +0000 (09:20 +0300)]
changelog & docs

5 years agoparsers configurable
Alex S [Thu, 11 Jul 2019 13:04:42 +0000 (16:04 +0300)]
parsers configurable

5 years agoMerge branch 'feature/mrf-transparency-filter' into 'develop'
kaniini [Sat, 13 Jul 2019 19:06:54 +0000 (19:06 +0000)]
Merge branch 'feature/mrf-transparency-filter' into 'develop'

nodeinfo: implement MRF transparency exclusions

See merge request pleroma/pleroma!1412

5 years agodocs: note that exclusions usage will be included in the transparency metrics if...
Ariadne Conill [Sat, 13 Jul 2019 19:00:03 +0000 (19:00 +0000)]
docs: note that exclusions usage will be included in the transparency metrics if used

5 years agonodeinfo: implement MRF transparency exclusions
Ariadne Conill [Sat, 13 Jul 2019 18:30:45 +0000 (18:30 +0000)]
nodeinfo: implement MRF transparency exclusions

5 years agoMerge branch '1041-status-actions-rate-limit' into 'develop'
kaniini [Sat, 13 Jul 2019 14:17:17 +0000 (14:17 +0000)]
Merge branch '1041-status-actions-rate-limit' into 'develop'

Rate-limited status actions (per user and per user+status).

Closes #1041

See merge request pleroma/pleroma!1410

5 years ago[#1041] Minor refactoring.
Ivan Tashkinov [Sat, 13 Jul 2019 12:21:50 +0000 (15:21 +0300)]
[#1041] Minor refactoring.

5 years ago[#1041] Added documentation on existing rate limiters.
Ivan Tashkinov [Sat, 13 Jul 2019 12:13:26 +0000 (15:13 +0300)]
[#1041] Added documentation on existing rate limiters.

5 years agoMerge branch 'fix/hackney-global-options' into 'develop'
Haelwenn [Sat, 13 Jul 2019 11:55:09 +0000 (11:55 +0000)]
Merge branch 'fix/hackney-global-options' into 'develop'

Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues

See merge request pleroma/pleroma!1409

5 years ago[#1041] Rate-limited status actions (per user and per user+status).
Ivan Tashkinov [Sat, 13 Jul 2019 11:49:39 +0000 (14:49 +0300)]
[#1041] Rate-limited status actions (per user and per user+status).

5 years agoAdd a changelog entry for tolerating incorrect chain order
rinpatch [Fri, 12 Jul 2019 23:04:26 +0000 (02:04 +0300)]
Add a changelog entry for tolerating incorrect chain order

5 years agoMerge branch 'fix/ap-hide-follows' into 'develop'
Haelwenn [Sat, 13 Jul 2019 10:22:19 +0000 (10:22 +0000)]
Merge branch 'fix/ap-hide-follows' into 'develop'

ActivityPub Controller: Change how hiding follows/followers is represented

See merge request pleroma/pleroma!1406

5 years agoWorkaround for remote server certificate chain issues
rinpatch [Fri, 12 Jul 2019 20:53:21 +0000 (23:53 +0300)]
Workaround for remote server certificate chain issues

5 years agoMerge the default options with custom ones in ReverseProxy and
rinpatch [Fri, 12 Jul 2019 20:52:26 +0000 (23:52 +0300)]
Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP

5 years agoAdd changelog entries for follower/following collection behaviour changes
rinpatch [Fri, 12 Jul 2019 18:49:16 +0000 (21:49 +0300)]
Add changelog entries for follower/following collection behaviour changes

5 years agoMerge branch 'develop' into fix/ap-hide-follows
rinpatch [Fri, 12 Jul 2019 18:43:06 +0000 (21:43 +0300)]
Merge branch 'develop' into fix/ap-hide-follows

5 years agoActivityPub Controller: Actually pass for_user to following/followers
rinpatch [Fri, 12 Jul 2019 17:54:20 +0000 (20:54 +0300)]
ActivityPub Controller: Actually pass for_user to following/followers
views and give 403 errors when trying to request hidden follower pages
when unauthenticated

5 years agotry to always match the filename for proxy url
Sachin Joshi [Fri, 12 Jul 2019 16:34:30 +0000 (22:19 +0545)]
try to always match the filename for proxy url

5 years agoMerge branch 'tests/web_metadata' into 'develop'
kaniini [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Merge branch 'tests/web_metadata' into 'develop'

Pleroma.Web.Metadata - tests

See merge request pleroma/pleroma!1401

5 years agoPleroma.Web.Metadata - tests
Maksim [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Pleroma.Web.Metadata - tests

5 years agoActivityPub User view: Following/Followers refactoring
rinpatch [Fri, 12 Jul 2019 16:41:05 +0000 (19:41 +0300)]
ActivityPub User view: Following/Followers refactoring

- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it

5 years agoMerge branch 'fix/pleroma-extensions' into 'develop'
kaniini [Fri, 12 Jul 2019 16:33:58 +0000 (16:33 +0000)]
Merge branch 'fix/pleroma-extensions' into 'develop'

Move new endpoints to pleroma namespace in Mastodon API

See merge request pleroma/pleroma!1404

5 years agoMove these to pleroma namespace in Mastodon API
Mark Felder [Fri, 12 Jul 2019 16:25:58 +0000 (11:25 -0500)]
Move these to pleroma namespace in Mastodon API

5 years agoAP user view: Add a test for hiding totalItems in following/followers
rinpatch [Fri, 12 Jul 2019 15:36:07 +0000 (18:36 +0300)]
AP user view: Add a test for hiding totalItems in following/followers

5 years agoMerge branch 'url-parser-proxy' into 'develop'
kaniini [Fri, 12 Jul 2019 15:34:00 +0000 (15:34 +0000)]
Merge branch 'url-parser-proxy' into 'develop'

preserve the original path/filename (no encoding/decoding) for proxy

See merge request pleroma/pleroma!1403

5 years agopreserve the original path/filename (no encoding/decoding) for proxy
Sachin Joshi [Fri, 12 Jul 2019 15:17:55 +0000 (21:02 +0545)]
preserve the original path/filename (no encoding/decoding) for proxy

5 years agoMerge branch 'search-limit-offset-type' into 'develop'
kaniini [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
Merge branch 'search-limit-offset-type' into 'develop'

Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search

See merge request pleroma/pleroma!1386

5 years agoExtend Pleroma.Pagination to support offset-based pagination, use async/await to...
Eugenij [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel

5 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 11 Jul 2019 13:17:03 +0000 (20:17 +0700)]
Update CHANGELOG

5 years agoMerge branch 'admin-configure' into 'develop'
kaniini [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
Merge branch 'admin-configure' into 'develop'

admin api configure changes

See merge request pleroma/pleroma!1345

5 years agoadmin api configure changes
Alexander Strizhakov [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
admin api configure changes

5 years agoMerge branch 'fix/1019-refactor' into 'develop'
kaniini [Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)]
Merge branch 'fix/1019-refactor' into 'develop'

Fix/1019 refactor

See merge request pleroma/pleroma!1397

5 years agoAdd `list` to Visibility
Egor Kislitsyn [Thu, 11 Jul 2019 12:29:24 +0000 (19:29 +0700)]
Add `list` to Visibility

5 years agoAdd "listMessage"
Egor Kislitsyn [Thu, 11 Jul 2019 09:36:08 +0000 (16:36 +0700)]
Add "listMessage"

5 years agoMerge branch 'chore/mailmap' into 'develop'
kaniini [Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)]
Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399

5 years agoadd mailmap [ci skip]
Ariadne Conill [Thu, 11 Jul 2019 08:57:30 +0000 (08:57 +0000)]
add mailmap [ci skip]

5 years agoMerge branch 'develop' into feature/addressable-lists
Egor Kislitsyn [Thu, 11 Jul 2019 06:26:59 +0000 (13:26 +0700)]
Merge branch 'develop' into feature/addressable-lists

5 years agoenable synchronization by default
Alex S [Wed, 10 Jul 2019 15:55:11 +0000 (18:55 +0300)]
enable synchronization by default