akkoma
5 years agoMerge branch 'fix/mastoapi-status-view' into 'develop'
kaniini [Sun, 21 Apr 2019 04:22:56 +0000 (04:22 +0000)]
Merge branch 'fix/mastoapi-status-view' into 'develop'

MastoAPI reblog status view

See merge request pleroma/pleroma!1065

5 years agoSet correct values in the MastoAPI reblog status view
eugenijm [Mon, 15 Apr 2019 17:32:14 +0000 (20:32 +0300)]
Set correct values in the MastoAPI reblog status view

5 years agoMerge branch 'fix/follow-with-reblogs' into 'develop'
kaniini [Sun, 21 Apr 2019 00:41:16 +0000 (00:41 +0000)]
Merge branch 'fix/follow-with-reblogs' into 'develop'

Handle `reblogs` on the first follow request

See merge request pleroma/pleroma!1076

5 years agoMerge branch 'patch-1' into 'develop'
kaniini [Sun, 21 Apr 2019 00:40:29 +0000 (00:40 +0000)]
Merge branch 'patch-1' into 'develop'

Mention Mastodon 2.8+ follow import fix in changelog

See merge request pleroma/pleroma!1079

5 years agoMention Mastodon 2.8+ follow import fix in changelog
Francis Dinh [Sat, 20 Apr 2019 18:28:08 +0000 (18:28 +0000)]
Mention Mastodon 2.8+ follow import fix in changelog

5 years agoMerge branch 'patch-2' into 'develop'
Haelwenn [Sat, 20 Apr 2019 07:11:06 +0000 (07:11 +0000)]
Merge branch 'patch-2' into 'develop'

Gentoo English Installation Guide

See merge request pleroma/pleroma!1050

5 years agoInclude explicit warning for emerge config line as it will vary more widely based...
witches.live [Sat, 20 Apr 2019 07:11:06 +0000 (07:11 +0000)]
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres

5 years agoHandle `reblogs` on the first follow request in MastoAPI
eugenijm [Fri, 19 Apr 2019 05:35:05 +0000 (08:35 +0300)]
Handle `reblogs` on the first follow request in MastoAPI

5 years agoMerge branch 'feature/database-compaction' into 'develop'
kaniini [Fri, 19 Apr 2019 16:55:33 +0000 (16:55 +0000)]
Merge branch 'feature/database-compaction' into 'develop'

database compaction

See merge request pleroma/pleroma!473

5 years agoMerge branch 'feature/805-server-rendered-rel-me-links' into 'develop'
lambda [Fri, 19 Apr 2019 07:50:21 +0000 (07:50 +0000)]
Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop'

Feature/805 server rendered rel me links

Closes #805

See merge request pleroma/pleroma!1063

5 years agotypo fix
Alexander Strizhakov [Fri, 19 Apr 2019 07:50:21 +0000 (07:50 +0000)]
typo fix

docs for RelMe provider

5 years agoMerge branch '923_oauth_consumer_refactoring_ci' into 'develop'
lambda [Fri, 19 Apr 2019 07:49:26 +0000 (07:49 +0000)]
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'

OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047

5 years agoStream out deletes, mistakingly removed when resolving merge conflicts
rinpatch [Thu, 18 Apr 2019 21:47:02 +0000 (00:47 +0300)]
Stream out deletes, mistakingly removed when resolving merge conflicts

5 years agoAdd a changelog entry for removing embded objects mix task
rinpatch [Thu, 18 Apr 2019 21:26:46 +0000 (00:26 +0300)]
Add a changelog entry for removing embded objects mix task

5 years agoAdd some logging
rinpatch [Thu, 18 Apr 2019 21:17:37 +0000 (00:17 +0300)]
Add some logging

5 years agoremove query timeouts
rinpatch [Thu, 18 Apr 2019 20:58:59 +0000 (23:58 +0300)]
remove query timeouts

5 years agoReplace embedded object migration with a mix task
rinpatch [Thu, 18 Apr 2019 20:34:01 +0000 (23:34 +0300)]
Replace embedded object migration with a mix task

5 years agoAdd a guard to fetching reply activity
rinpatch [Thu, 18 Apr 2019 18:40:40 +0000 (21:40 +0300)]
Add a guard to fetching reply activity

5 years agoMerge branch 'bugfix/filter-boosted-blocks' into 'develop'
Haelwenn [Thu, 18 Apr 2019 18:29:57 +0000 (18:29 +0000)]
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'

activitypub: fix filtering of boosts from blocked users

See merge request pleroma/pleroma!1074

5 years agoMerge branch 'fix/mastoapi-search-unauth' into 'develop'
kaniini [Thu, 18 Apr 2019 18:21:28 +0000 (18:21 +0000)]
Merge branch 'fix/mastoapi-search-unauth' into 'develop'

Do not require authentication for user search in MastoAPI

See merge request pleroma/pleroma!1075

5 years agoDo not require authentication for user search in MastoAPI
Mark Felder [Thu, 18 Apr 2019 17:44:25 +0000 (12:44 -0500)]
Do not require authentication for user search in MastoAPI

5 years agoFix my incorrect search test fix
rinpatch [Thu, 18 Apr 2019 11:37:57 +0000 (14:37 +0300)]
Fix my incorrect search test fix

5 years agoAdd a migration to remove embeded objects
rinpatch [Thu, 18 Apr 2019 10:10:38 +0000 (13:10 +0300)]
Add a migration to remove embeded objects

5 years agoMerge branch 'develop' into feature/database-compaction
rinpatch [Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)]
Merge branch 'develop' into feature/database-compaction

5 years agoFix search in TwitterAPI
rinpatch [Thu, 18 Apr 2019 07:24:06 +0000 (10:24 +0300)]
Fix search in TwitterAPI

5 years agoFix object search depending on embeded object
rinpatch [Thu, 18 Apr 2019 06:28:20 +0000 (09:28 +0300)]
Fix object search depending on embeded object

5 years agoFix media timeline depending on embeded object and add some guards
rinpatch [Thu, 18 Apr 2019 05:31:08 +0000 (08:31 +0300)]
Fix media timeline depending on embeded object and add some guards

5 years agoUse the preloaded object in tag queries
rinpatch [Wed, 17 Apr 2019 22:37:04 +0000 (01:37 +0300)]
Use the preloaded object in tag queries

5 years agoactivitypub: fix filtering of boosts from blocked users
William Pitcock [Wed, 17 Apr 2019 22:27:59 +0000 (22:27 +0000)]
activitypub: fix filtering of boosts from blocked users

5 years agoMerge branch 'feature/improve-block-filtering' into 'develop'
kaniini [Wed, 17 Apr 2019 20:12:44 +0000 (20:12 +0000)]
Merge branch 'feature/improve-block-filtering' into 'develop'

activitypub: properly filter out transitive activities concerning blocked users

See merge request pleroma/pleroma!1072

5 years agoactivitypub: properly filter out transitive activities concerning blocked users
William Pitcock [Wed, 17 Apr 2019 20:05:09 +0000 (20:05 +0000)]
activitypub: properly filter out transitive activities concerning blocked users

5 years agoRemove containment tests from transmogrifier and fix thread visibility solver
rinpatch [Wed, 17 Apr 2019 14:59:15 +0000 (17:59 +0300)]
Remove containment tests from transmogrifier and fix thread visibility solver

5 years agoRefactor tests that used ActivityPub.fetch_object_from_id
rinpatch [Wed, 17 Apr 2019 14:03:35 +0000 (17:03 +0300)]
Refactor tests that used ActivityPub.fetch_object_from_id

5 years agoFix delete-by_ap_id to expect not only embeded objects
rinpatch [Wed, 17 Apr 2019 13:35:01 +0000 (16:35 +0300)]
Fix delete-by_ap_id to expect not only embeded objects

5 years agoRemove updating reply count for embeded objects
rinpatch [Wed, 17 Apr 2019 12:54:09 +0000 (15:54 +0300)]
Remove updating reply count for embeded objects

5 years agoRefactor all tests that acessed the embeded object
rinpatch [Wed, 17 Apr 2019 12:46:59 +0000 (15:46 +0300)]
Refactor all tests that acessed the embeded object

5 years agoIf it's an object struct it is already normalized
rinpatch [Wed, 17 Apr 2019 12:11:22 +0000 (15:11 +0300)]
If it's an object struct it is already normalized

5 years agoFix note count test
rinpatch [Wed, 17 Apr 2019 12:03:17 +0000 (15:03 +0300)]
Fix note count test

5 years agooof
rinpatch [Wed, 17 Apr 2019 11:55:26 +0000 (14:55 +0300)]
oof

5 years agoMake credo happy
rinpatch [Wed, 17 Apr 2019 11:52:01 +0000 (14:52 +0300)]
Make credo happy

5 years agoFix unbookmarking
rinpatch [Wed, 17 Apr 2019 11:27:02 +0000 (14:27 +0300)]
Fix unbookmarking

5 years agoUpdate functions in object fetcher for tesla and set up a proper mock for tests
rinpatch [Wed, 17 Apr 2019 11:21:39 +0000 (14:21 +0300)]
Update functions in object fetcher for tesla and set up a proper mock for tests

5 years agoAdded some more normalization calls all in mastodon api controller
rinpatch [Wed, 17 Apr 2019 10:04:58 +0000 (13:04 +0300)]
Added some more normalization calls all in mastodon api controller

5 years agoFix pinned posts relying on embded objects
rinpatch [Wed, 17 Apr 2019 09:34:19 +0000 (12:34 +0300)]
Fix pinned posts relying on embded objects

5 years agoFix warnings in object tests
rinpatch [Wed, 17 Apr 2019 09:27:29 +0000 (12:27 +0300)]
Fix warnings in object tests

5 years agoMerge branch 'develop' into feature/database-compaction
rinpatch [Wed, 17 Apr 2019 09:22:32 +0000 (12:22 +0300)]
Merge branch 'develop' into feature/database-compaction

5 years agoMerge branch '788-notify-email-changelog' into 'develop'
rinpatch [Wed, 17 Apr 2019 09:05:27 +0000 (09:05 +0000)]
Merge branch '788-notify-email-changelog' into 'develop'

changelog info

See merge request pleroma/pleroma!1070

5 years ago[#923] Minor semantic adjustment.
Ivan Tashkinov [Wed, 17 Apr 2019 08:33:21 +0000 (11:33 +0300)]
[#923] Minor semantic adjustment.

5 years agochanges
Alex S [Wed, 17 Apr 2019 07:27:51 +0000 (14:27 +0700)]
changes

5 years agochangelog info
Alex S [Wed, 17 Apr 2019 07:12:45 +0000 (14:12 +0700)]
changelog info

5 years agoMerge branch 'feature/788-separate-email-addresses' into 'develop'
kaniini [Tue, 16 Apr 2019 18:44:07 +0000 (18:44 +0000)]
Merge branch 'feature/788-separate-email-addresses' into 'develop'

Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040

5 years agoMerge branch 'fix/remote-follow-auth' into 'develop'
kaniini [Tue, 16 Apr 2019 18:40:56 +0000 (18:40 +0000)]
Merge branch 'fix/remote-follow-auth' into 'develop'

Fix: remote follows should not ask user to log-in again for authorization

See merge request pleroma/pleroma!1060

5 years agoMerge branch 'bugfix/relax-spam-protection' into 'develop'
Haelwenn [Tue, 16 Apr 2019 18:38:11 +0000 (18:38 +0000)]
Merge branch 'bugfix/relax-spam-protection' into 'develop'

activitypub: allow indirect messages from users being followed at a personal inbox

See merge request pleroma/pleroma!1069

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Tue, 16 Apr 2019 18:35:58 +0000 (18:35 +0000)]
Merge branch 'patch-2' into 'develop'

Add supervisord configuration

See merge request pleroma/pleroma!1066

5 years agoMerge branch 'fix/follow-imports' into 'develop'
kaniini [Tue, 16 Apr 2019 18:35:38 +0000 (18:35 +0000)]
Merge branch 'fix/follow-imports' into 'develop'

Handle new-style mastodon follow lists

Closes #814

See merge request pleroma/pleroma!1067

5 years agoHandle new-style mastodon follow lists
Normandy [Tue, 16 Apr 2019 18:35:38 +0000 (18:35 +0000)]
Handle new-style mastodon follow lists

Fixes https://git.pleroma.social/pleroma/pleroma/issues/814

5 years agoactivitypub: allow indirect messages from users being followed at a personal inbox
William Pitcock [Tue, 16 Apr 2019 18:10:15 +0000 (18:10 +0000)]
activitypub: allow indirect messages from users being followed at a personal inbox

5 years agoAdd extra_cookie_attrs to changelog
Hakurei Reimu [Tue, 16 Apr 2019 14:24:24 +0000 (22:24 +0800)]
Add extra_cookie_attrs to changelog

5 years agomake Pleroma.Endpoint use extra_cookie_attrs in config
Hakurei Reimu [Mon, 15 Apr 2019 04:33:46 +0000 (12:33 +0800)]
make Pleroma.Endpoint use extra_cookie_attrs in config

5 years agoadd extra_cookie_attrs option to config
Hakurei Reimu [Mon, 15 Apr 2019 04:31:37 +0000 (12:31 +0800)]
add extra_cookie_attrs option to config

Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.

5 years agoMerge branch 'deps/bump-exdoc' into 'develop'
rinpatch [Tue, 16 Apr 2019 11:59:38 +0000 (11:59 +0000)]
Merge branch 'deps/bump-exdoc' into 'develop'

Bump ex_doc to 20.2

See merge request pleroma/pleroma!1068

5 years agoBump ex_doc
rinpatch [Tue, 16 Apr 2019 11:53:17 +0000 (14:53 +0300)]
Bump ex_doc

5 years agoAdd supervisord configuration
Dominik V. Salonen [Tue, 16 Apr 2019 07:14:44 +0000 (07:14 +0000)]
Add supervisord configuration

5 years agoMerge branch 'remove-footguns' into 'develop'
rinpatch [Mon, 15 Apr 2019 13:57:38 +0000 (13:57 +0000)]
Merge branch 'remove-footguns' into 'develop'

Remove ambiguous documentation regarding emoji and config.exs

See merge request pleroma/pleroma!1064

5 years agoCustom Emoji docs: Make it clear that config.exs is not for lewd.
lain [Mon, 15 Apr 2019 13:51:17 +0000 (15:51 +0200)]
Custom Emoji docs: Make it clear that config.exs is not for lewd.

5 years agoConfig.exs: Add big warning so that nobody ever edits it.
lain [Mon, 15 Apr 2019 13:45:15 +0000 (15:45 +0200)]
Config.exs: Add big warning so that nobody ever edits it.

5 years agoMerge branch 'fix/status-reblogged' into 'develop'
lambda [Mon, 15 Apr 2019 10:26:23 +0000 (10:26 +0000)]
Merge branch 'fix/status-reblogged' into 'develop'

Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057

5 years agoMerge branch 'unfollow-oneself' into 'develop'
lambda [Mon, 15 Apr 2019 10:24:37 +0000 (10:24 +0000)]
Merge branch 'unfollow-oneself' into 'develop'

Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061

5 years agoMerge branch 'refactor/remove-inReplyToStatusId' into 'develop'
lambda [Mon, 15 Apr 2019 10:23:06 +0000 (10:23 +0000)]
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'

Remove inReplyToStatusId

See merge request pleroma/pleroma!1062

5 years agoUse User.get_cached_by*
eugenijm [Mon, 15 Apr 2019 09:37:49 +0000 (12:37 +0300)]
Use User.get_cached_by*

5 years agooops
rinpatch [Mon, 15 Apr 2019 08:59:01 +0000 (11:59 +0300)]
oops

5 years agoRemove inReplyToStatusId
rinpatch [Mon, 15 Apr 2019 08:50:36 +0000 (11:50 +0300)]
Remove inReplyToStatusId

5 years agoHandle follow/unfollow directed to themselves
eugenijm [Mon, 15 Apr 2019 06:44:16 +0000 (09:44 +0300)]
Handle follow/unfollow directed to themselves

5 years agoMerge branch 'bugfix/registration-email-pattern' into 'develop'
rinpatch [Sun, 14 Apr 2019 17:54:32 +0000 (17:54 +0000)]
Merge branch 'bugfix/registration-email-pattern' into 'develop'

fix pattern match on user registration

See merge request pleroma/pleroma!1058

5 years agoRevert "Assert on the success of enqueue before returning"
Sadposter [Sun, 14 Apr 2019 15:12:54 +0000 (16:12 +0100)]
Revert "Assert on the success of enqueue before returning"

This reverts commit 16d8c8b33b654b88e5e934832d5e26eb7152633e.
Because it breaks everything

5 years agoAssert on the success of enqueue before returning
Sadposter [Sun, 14 Apr 2019 15:05:26 +0000 (16:05 +0100)]
Assert on the success of enqueue before returning

5 years agoAlways return {atom, _} from try_send_confirmation
Sadposter [Sun, 14 Apr 2019 15:01:48 +0000 (16:01 +0100)]
Always return {atom, _} from try_send_confirmation

5 years agofix pattern match on user registration
Sadposter [Sun, 14 Apr 2019 14:46:54 +0000 (15:46 +0100)]
fix pattern match on user registration

deliver_async will return a single atom

5 years agoAssign reblogged in the Mastodon reblog status view
eugenijm [Sun, 14 Apr 2019 02:15:03 +0000 (05:15 +0300)]
Assign reblogged in the Mastodon reblog status view

5 years agoMerge branch 'docs/archlinux-odbc' into 'develop'
kaniini [Sun, 14 Apr 2019 05:34:17 +0000 (05:34 +0000)]
Merge branch 'docs/archlinux-odbc' into 'develop'

docs/installation/arch_linux_en.md: Remove useless ODBC

See merge request pleroma/pleroma!1055

5 years agodocs/installation/arch_linux_en.md: Remove useless ODBC
Haelwenn (lanodan) Monnier [Sat, 13 Apr 2019 20:41:54 +0000 (22:41 +0200)]
docs/installation/arch_linux_en.md: Remove useless ODBC

See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402

5 years agoMerge branch 'docs/changelog' into 'develop'
Haelwenn [Sat, 13 Apr 2019 20:29:05 +0000 (20:29 +0000)]
Merge branch 'docs/changelog' into 'develop'

Add a changelog

See merge request pleroma/pleroma!1053

5 years agoPut an actual description of the vulnerability and add **Breaking:** to breaking...
rinpatch [Sat, 13 Apr 2019 18:17:10 +0000 (21:17 +0300)]
Put an actual description of the vulnerability and add **Breaking:** to breaking changes

5 years agonaming fix
Alex S [Sat, 13 Apr 2019 07:55:42 +0000 (14:55 +0700)]
naming fix

5 years agoMerge develop to 788-separate-email-addresses
Alex S [Sat, 13 Apr 2019 05:24:38 +0000 (12:24 +0700)]
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

5 years agofallback to the old behaviour
Alex S [Sat, 13 Apr 2019 05:20:36 +0000 (12:20 +0700)]
fallback to the old behaviour

admin and user mailers

5 years agoAdd a changelog
rinpatch [Fri, 12 Apr 2019 21:31:18 +0000 (00:31 +0300)]
Add a changelog

5 years agoMerge branch 'improve-formatter' into 'develop'
Haelwenn [Fri, 12 Apr 2019 19:25:53 +0000 (19:25 +0000)]
Merge branch 'improve-formatter' into 'develop'

Improve formatter and update `auto_linker`

Closes #795

See merge request pleroma/pleroma!1036

5 years agoRevert "simplify mentions escape"
Egor [Fri, 12 Apr 2019 19:25:53 +0000 (19:25 +0000)]
Revert "simplify mentions escape"

This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.

5 years agoMerge branch 'bugfix/pleroma-email-naming' into 'develop'
lambda [Fri, 12 Apr 2019 10:41:09 +0000 (10:41 +0000)]
Merge branch 'bugfix/pleroma-email-naming' into 'develop'

Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029

5 years agoMerge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
lambda [Fri, 12 Apr 2019 09:34:12 +0000 (09:34 +0000)]
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'

Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976

5 years agoMerge branch 'fix/732-password-align' into 'develop'
lambda [Fri, 12 Apr 2019 09:13:30 +0000 (09:13 +0000)]
Merge branch 'fix/732-password-align' into 'develop'

password reset page labels align

See merge request pleroma/pleroma!986

5 years agoMerge branch 'ssl_trusted_cert' into 'develop'
lambda [Fri, 12 Apr 2019 08:58:46 +0000 (08:58 +0000)]
Merge branch 'ssl_trusted_cert' into 'develop'

ssl_trusted_certificate should point to chain.pem if we're demonstrating...

See merge request pleroma/pleroma!996

5 years agoMerge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'
kaniini [Fri, 12 Apr 2019 02:28:46 +0000 (02:28 +0000)]
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'

adding destroy multiple for mastofe

See merge request pleroma/pleroma!1046

5 years agoadding destroy multiple for mastofe
Alexander Strizhakov [Fri, 12 Apr 2019 02:28:46 +0000 (02:28 +0000)]
adding destroy multiple for mastofe

5 years agoMerge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into...
kaniini [Fri, 12 Apr 2019 02:21:32 +0000 (02:21 +0000)]
Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop'

in_reply_to_id - null

See merge request pleroma/pleroma!1037

5 years agoin_reply_to_id - null
Alexander Strizhakov [Fri, 12 Apr 2019 02:21:32 +0000 (02:21 +0000)]
in_reply_to_id - null

5 years agoMerge branch 'fix/hackney_max_body_param' into 'develop'
kaniini [Thu, 11 Apr 2019 17:54:31 +0000 (17:54 +0000)]
Merge branch 'fix/hackney_max_body_param' into 'develop'

Add `with_body: true` to requests relying on `max_body: val`

Closes #778

See merge request pleroma/pleroma!1049

5 years agoAdd `with_body: true` to requests relying on `max_body: val`
Roman Chvanikov [Thu, 11 Apr 2019 17:16:15 +0000 (00:16 +0700)]
Add `with_body: true` to requests relying on `max_body: val`

5 years agoMerge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'
lambda [Thu, 11 Apr 2019 11:24:36 +0000 (11:24 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'

Update Mastodon Frontend to 2019-04-11 bundle

See merge request pleroma/pleroma!1044