Commit graph

4750 commits

Author SHA1 Message Date
Roman Chvanikov
60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-20 19:43:06 +07:00
Roman Chvanikov
05cdb2f238 Do not track coverage files 2019-04-20 19:42:50 +07:00
Roman Chvanikov
64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Haelwenn
6ca82c18a7 Merge branch 'patch-2' into 'develop'
Gentoo English Installation Guide

See merge request pleroma/pleroma!1050
2019-04-20 07:11:06 +00:00
witches.live
8166cefa21 Include explicit warning for emerge config line as it will vary more widely based on current version of postgres 2019-04-20 07:11:06 +00:00
kaniini
9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
database compaction

See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
Roman Chvanikov
73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-19 23:27:13 +07:00
Roman Chvanikov
bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Roman Chvanikov
aeafa0b2ef Add Notification.for_user_since/2 2019-04-19 22:16:17 +07:00
lambda
cc93775ebf 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
2019-04-19 07:50:21 +00:00
Alexander Strizhakov
ada384207b typo fix
docs for RelMe provider
2019-04-19 07:50:21 +00:00
lambda
218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
rinpatch
f9865cf943 Stream out deletes, mistakingly removed when resolving merge conflicts 2019-04-19 00:47:02 +03:00
rinpatch
17d94ae267 Add a changelog entry for removing embded objects mix task 2019-04-19 00:26:46 +03:00
rinpatch
73b8c5387b Add some logging 2019-04-19 00:17:37 +03:00
rinpatch
945325013a remove query timeouts 2019-04-18 23:58:59 +03:00
rinpatch
099f89367e Replace embedded object migration with a mix task 2019-04-18 23:34:01 +03:00
rinpatch
9238dccac1 Add a guard to fetching reply activity 2019-04-18 21:40:40 +03:00
Haelwenn
eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
activitypub: fix filtering of boosts from blocked users

See merge request pleroma/pleroma!1074
2019-04-18 18:29:57 +00:00
kaniini
ad3270c241 Merge branch 'fix/mastoapi-search-unauth' into 'develop'
Do not require authentication for user search in MastoAPI

See merge request pleroma/pleroma!1075
2019-04-18 18:21:28 +00:00
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
Roman Chvanikov
2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
Roman Chvanikov
87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-17 16:58:08 +07: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