Alex S c349573791 Merge develop to 788-separate-email-addresses ...

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs

2019-04-13 12:24:38 +07:00

..

activity_pub

Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'

2019-04-08 11:42:20 +00:00

admin_api

Merge branch 'bugfix/pleroma-email-naming' into 'develop'

2019-04-12 10:41:09 +00:00

common_api

Ignore dates in wrong formats

2019-04-02 11:32:36 +02:00

http_sigs

…

instances

[Credo] fix Credo.Check.Readability.MaxLineLength

2019-03-13 04:26:56 +01:00

mastodon_api

Merge develop to 788-separate-email-addresses

2019-04-13 12:24:38 +07:00

metadata

…

oauth

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

2019-04-08 12:20:26 +03:00

ostatus

change Repo.get(Activity, id) => Activity.get_by_id(id) in tests

2019-04-02 17:08:03 +07:00

plugs

…

push

Use PleromaJobQueue in Pleroma.Web.Push

2019-04-05 19:38:44 +07:00

rich_media

helpers: use AutoLinker to validate URIs as well as the other tests

2019-03-04 18:31:49 +00:00

salmon

replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)

2019-04-02 17:47:52 +07:00

twitter_api

Merge branch 'bugfix/pleroma-email-naming' into 'develop'

2019-04-12 10:41:09 +00:00

views

tests: fix tests

2019-02-20 17:23:05 +00:00

web_finger

…

websub

[Credo] fix Credo.Check.Readability.AliasOrder

2019-03-13 04:26:54 +01:00

federator_test.exs

[Credo] fix Credo.Check.Readability.AliasOrder

2019-03-13 04:26:54 +01:00

node_info_test.exs

NodeInfo: Return safe_dm_mentions feature flag.

2019-03-22 11:57:20 +01:00

rel_me_test.exs

Web.RelMe: Fix having other values in rel attr

2019-03-05 02:13:22 +01:00

retry_queue_test.exs

…

streamer_test.exs

Fix streamer test

2019-03-15 14:20:08 +01:00