Commit graph

4824 commits

Author SHA1 Message Date
Mark Felder
1aa4994f6d Do not require authentication for user search in MastoAPI 2019-04-18 12:44:25 -05:00
rinpatch
4ef237f26a Fix my incorrect search test fix 2019-04-18 14:37:57 +03:00
rinpatch
a11ca87f40 Add a migration to remove embeded objects 2019-04-18 13:10:38 +03:00
rinpatch
83589ca6a5 Merge branch 'develop' into feature/database-compaction 2019-04-18 12:56:38 +03:00
rinpatch
ac04311b3f Fix search in TwitterAPI 2019-04-18 10:24:06 +03:00
rinpatch
6069d0fd36 Fix object search depending on embeded object 2019-04-18 09:28:20 +03:00
rinpatch
e31a22043b Fix media timeline depending on embeded object and add some guards 2019-04-18 08:31:08 +03:00
rinpatch
2abc09570f Use the preloaded object in tag queries 2019-04-18 01:37:04 +03:00
William Pitcock
36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
kaniini
8c65b69d4a Merge branch 'feature/improve-block-filtering' into 'develop'
activitypub: properly filter out transitive activities concerning blocked users

See merge request pleroma/pleroma!1072
2019-04-17 20:12:44 +00:00
William Pitcock
2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00:00
rinpatch
35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver 2019-04-17 17:59:15 +03:00
rinpatch
d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id 2019-04-17 17:03:35 +03:00
rinpatch
4c289e924e Fix delete-by_ap_id to expect not only embeded objects 2019-04-17 16:35:01 +03:00
rinpatch
8e4d950f31 Remove updating reply count for embeded objects 2019-04-17 15:54:09 +03:00
rinpatch
ff8d76c670 Refactor all tests that acessed the embeded object 2019-04-17 15:46:59 +03:00
rinpatch
c3a2052806 If it's an object struct it is already normalized 2019-04-17 15:11:22 +03:00
rinpatch
54b82f236b Fix note count test 2019-04-17 15:03:17 +03:00
rinpatch
a53b917e7f oof 2019-04-17 14:55:26 +03:00
rinpatch
ad681877df Make credo happy 2019-04-17 14:52:01 +03:00
rinpatch
e641651e2b Fix unbookmarking 2019-04-17 14:27:02 +03:00
rinpatch
e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests 2019-04-17 14:21:39 +03:00
rinpatch
b09ae02c04 Added some more normalization calls all in mastodon api controller 2019-04-17 13:04:58 +03:00
rinpatch
462028688b Fix pinned posts relying on embded objects 2019-04-17 12:34:19 +03:00
rinpatch
dda4e0e2a8 Fix warnings in object tests 2019-04-17 12:27:29 +03:00
rinpatch
627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
rinpatch
8de17c480e Merge branch '788-notify-email-changelog' into 'develop'
changelog info

See merge request pleroma/pleroma!1070
2019-04-17 09:05:27 +00:00
Ivan Tashkinov
128aae05f3 [#923] Minor semantic adjustment. 2019-04-17 11:33:21 +03:00
Alex S
2198e54d28 changes 2019-04-17 14:27:51 +07:00
Alex S
6ac948c5b8 changelog info 2019-04-17 14:12:45 +07:00
kaniini
73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
kaniini
02a53d00c9 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
2019-04-16 18:40:56 +00:00
Haelwenn
cde7711b12 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
2019-04-16 18:38:11 +00:00
kaniini
6ddaeb14e2 Merge branch 'patch-2' into 'develop'
Add supervisord configuration

See merge request pleroma/pleroma!1066
2019-04-16 18:35:58 +00:00
kaniini
5f31e7ec6b Merge branch 'fix/follow-imports' into 'develop'
Handle new-style mastodon follow lists

Closes #814

See merge request pleroma/pleroma!1067
2019-04-16 18:35:38 +00:00
Normandy
d4a749cfb2 Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16 18:35:38 +00:00
William Pitcock
750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox 2019-04-16 18:31:12 +00:00
Hakurei Reimu
2472efb4e9
Add extra_cookie_attrs to changelog 2019-04-16 22:24:24 +08:00
Hakurei Reimu
6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config 2019-04-16 22:20:56 +08:00
Hakurei Reimu
10096bbf2b 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`.
2019-04-16 22:20:56 +08:00
rinpatch
0d4afdc6e6 Merge branch 'deps/bump-exdoc' into 'develop'
Bump ex_doc to 20.2

See merge request pleroma/pleroma!1068
2019-04-16 11:59:38 +00:00
rinpatch
37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Dominik V. Salonen
498c96d458 Add supervisord configuration 2019-04-16 07:14:44 +00:00
rinpatch
776f1e3bdf Merge branch 'remove-footguns' into 'develop'
Remove ambiguous documentation regarding emoji and config.exs

See merge request pleroma/pleroma!1064
2019-04-15 13:57:38 +00:00
lain
088f378408 Custom Emoji docs: Make it clear that config.exs is not for lewd. 2019-04-15 15:51:17 +02:00
lain
4fecd6f9a7 Config.exs: Add big warning so that nobody ever edits it. 2019-04-15 15:45:15 +02:00
lambda
56956de6fa Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
lambda
f358295cbe Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
lambda
f896699357 Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'
Remove inReplyToStatusId

See merge request pleroma/pleroma!1062
2019-04-15 10:23:06 +00:00
eugenijm
27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00