Ariadne Conill [Mon, 7 Oct 2019 12:14:04 +0000 (12:14 +0000)]
update changelog date
Ariadne Conill [Mon, 7 Oct 2019 12:10:36 +0000 (12:10 +0000)]
Pleroma 1.0.91 (aka 1.1 RC2).
kaniini [Mon, 7 Oct 2019 11:40:31 +0000 (11:40 +0000)]
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
backport: Mastodon API: Fix private and direct statuses not being filtered out from the...
See merge request pleroma/pleroma!1807
kaniini [Mon, 7 Oct 2019 11:37:01 +0000 (11:37 +0000)]
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'
clean up bundled litepub schema (closes #1303)
See merge request pleroma/pleroma!1809
Ariadne Conill [Mon, 7 Oct 2019 11:33:58 +0000 (11:33 +0000)]
clean up bundled litepub schema (closes #1303)
eugenijm [Fri, 20 Sep 2019 14:54:38 +0000 (17:54 +0300)]
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
kaniini [Sun, 6 Oct 2019 15:33:33 +0000 (15:33 +0000)]
Merge branch 'backport/custom-field-update' into 'maint/1.1'
Backport: custom field update
See merge request pleroma/pleroma!1805
rinpatch [Sun, 6 Oct 2019 15:32:33 +0000 (15:32 +0000)]
Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'
Backport moving out keys from user info to 1.1
See merge request pleroma/pleroma!1801
Ariadne Conill [Sun, 6 Oct 2019 15:17:33 +0000 (15:17 +0000)]
changelog
rinpatch [Sun, 6 Oct 2019 14:53:03 +0000 (17:53 +0300)]
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
kPherox [Mon, 26 Aug 2019 08:09:32 +0000 (17:09 +0900)]
Extract if block into private function
kPherox [Sun, 25 Aug 2019 18:49:47 +0000 (03:49 +0900)]
Update test for custom fields when content-type urlencoded
kPherox [Sun, 25 Aug 2019 18:25:06 +0000 (03:25 +0900)]
Update test for custom fields when name empty string
kPherox [Sat, 24 Aug 2019 22:04:46 +0000 (07:04 +0900)]
Change to delete empty name field
kPherox [Sat, 24 Aug 2019 22:02:32 +0000 (07:02 +0900)]
Fix type of fields_attributes
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
kPherox [Sat, 24 Aug 2019 21:51:05 +0000 (06:51 +0900)]
Rename fields to fields_attributes
kaniini [Sun, 6 Oct 2019 15:07:38 +0000 (15:07 +0000)]
Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'
backport: poll refreshing
See merge request pleroma/pleroma!1804
kaniini [Sun, 6 Oct 2019 14:59:58 +0000 (14:59 +0000)]
Merge branch 'backport/fix-report-email' into 'maint/1.1'
backport: Use the user.id instead of nickname in report URLs
See merge request pleroma/pleroma!1802
Ariadne Conill [Sun, 6 Oct 2019 14:54:44 +0000 (14:54 +0000)]
add changelog
rinpatch [Wed, 18 Sep 2019 19:09:03 +0000 (22:09 +0300)]
Fix credo issues
rinpatch [Wed, 18 Sep 2019 16:59:23 +0000 (19:59 +0300)]
Do not refetch local objects
rinpatch [Wed, 18 Sep 2019 16:53:51 +0000 (19:53 +0300)]
Preserve internal fields when reinjecting
rinpatch [Wed, 18 Sep 2019 16:24:20 +0000 (19:24 +0300)]
Move object internal fields to a constant
rinpatch [Wed, 18 Sep 2019 16:07:25 +0000 (19:07 +0300)]
Set updated_at even if the object stayed the same
rinpatch [Wed, 18 Sep 2019 15:52:33 +0000 (18:52 +0300)]
Fix wrong argument order when calling NaiveDateTime.diff
rinpatch [Wed, 18 Sep 2019 15:31:24 +0000 (18:31 +0300)]
Capture log in object refetch tests
rinpatch [Wed, 18 Sep 2019 15:13:21 +0000 (18:13 +0300)]
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
feld [Sun, 6 Oct 2019 14:13:04 +0000 (14:13 +0000)]
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
rinpatch [Sun, 6 Oct 2019 14:05:51 +0000 (17:05 +0300)]
Fix the use of queries with a schema in a migration
rinpatch [Sun, 6 Oct 2019 13:22:35 +0000 (16:22 +0300)]
Move local keys out of `user.info`
kaniini [Sat, 5 Oct 2019 19:46:23 +0000 (19:46 +0000)]
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
backport update activity fixes to maint/1.1
See merge request pleroma/pleroma!1797
Ariadne Conill [Sat, 5 Oct 2019 19:32:23 +0000 (19:32 +0000)]
update changelog
lain [Sat, 5 Oct 2019 12:53:50 +0000 (14:53 +0200)]
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
lain [Sat, 5 Oct 2019 12:49:45 +0000 (14:49 +0200)]
ActivityPub / Transmogrifier: Correctly store incoming Update id.
kaniini [Fri, 4 Oct 2019 22:37:45 +0000 (22:37 +0000)]
Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'
backport MR 1779 to maint/1.1
See merge request pleroma/pleroma!1791
Ariadne Conill [Fri, 4 Oct 2019 21:43:15 +0000 (21:43 +0000)]
update changelog
Haelwenn (lanodan) Monnier [Fri, 4 Oct 2019 04:47:36 +0000 (06:47 +0200)]
notification_view.ex: Make sure `account` isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
kaniini [Fri, 4 Oct 2019 22:11:34 +0000 (22:11 +0000)]
Merge branch 'backport/hex-flake-id' into 'maint/1.1'
backport: hex `flake_id` support
See merge request pleroma/pleroma!1793
kaniini [Fri, 4 Oct 2019 22:01:38 +0000 (22:01 +0000)]
Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'
backport: Track failed proxy urls and don't request them again
See merge request pleroma/pleroma!1792
Ariadne Conill [Fri, 4 Oct 2019 22:00:18 +0000 (22:00 +0000)]
changelog
Egor Kislitsyn [Wed, 18 Sep 2019 14:54:31 +0000 (21:54 +0700)]
Replace `Pleroma.FlakeId` with `flake_id` hex package
Sergey Suprunenko [Tue, 1 Oct 2019 20:00:27 +0000 (20:00 +0000)]
Track failed proxy urls and don't request them again
kaniini [Fri, 4 Oct 2019 21:47:34 +0000 (21:47 +0000)]
Merge branch 'backport/issue-1296' into 'maint/1.1'
backport 1296 fix to maint/1.1
See merge request pleroma/pleroma!1790
Ariadne Conill [Fri, 4 Oct 2019 21:36:49 +0000 (21:36 +0000)]
update changelog
Maksim Pechnikov [Fri, 4 Oct 2019 19:20:53 +0000 (22:20 +0300)]
removed legacy api: "/objects/:uuid/likes"
kaniini [Fri, 4 Oct 2019 21:29:01 +0000 (21:29 +0000)]
Merge branch 'backport/undo-fixes' into 'maint/1.1'
backport: undo fixes
See merge request pleroma/pleroma!1789
Ariadne Conill [Fri, 4 Oct 2019 21:18:38 +0000 (21:18 +0000)]
update changelog
lain [Fri, 4 Oct 2019 15:10:49 +0000 (17:10 +0200)]
ActivityPub.Utils: Fix undo test.
lain [Fri, 4 Oct 2019 14:32:42 +0000 (16:32 +0200)]
ActivityPub: Change addressing of Undo.
kaniini [Fri, 4 Oct 2019 18:23:33 +0000 (18:23 +0000)]
Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'
Sync 1.1.0 changelog with develop
See merge request pleroma/pleroma!1787
rinpatch [Fri, 4 Oct 2019 18:19:17 +0000 (21:19 +0300)]
Remove entries from develop that were in the section for some reason
rinpatch [Fri, 4 Oct 2019 18:17:29 +0000 (21:17 +0300)]
Add back streaming fix entry
rinpatch [Fri, 4 Oct 2019 18:13:35 +0000 (21:13 +0300)]
Sync 1.1.0 changelog with develop
Mostly !1724 backport, but as a new commit because it was easier
this way
kaniini [Fri, 4 Oct 2019 17:39:28 +0000 (17:39 +0000)]
Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
widen streaming API blocks (for 1.1)
See merge request pleroma/pleroma!1785
kaniini [Fri, 4 Oct 2019 17:39:20 +0000 (17:39 +0000)]
Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
Backport !1777 to 1.1
See merge request pleroma/pleroma!1786
rinpatch [Thu, 3 Oct 2019 22:05:50 +0000 (01:05 +0300)]
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
Ariadne Conill [Fri, 4 Oct 2019 16:45:14 +0000 (16:45 +0000)]
tests: add missing ExUnit.CaptureLog
Ariadne Conill [Fri, 4 Oct 2019 16:15:54 +0000 (16:15 +0000)]
application: fix up after_supervisor_start removal backport
Ariadne Conill [Fri, 4 Oct 2019 15:45:06 +0000 (15:45 +0000)]
update changelog
Ariadne Conill [Fri, 4 Oct 2019 15:42:25 +0000 (15:42 +0000)]
streamer: worker: actually use should_send? consistently
Ariadne Conill [Fri, 4 Oct 2019 15:41:55 +0000 (15:41 +0000)]
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
Ariadne Conill [Fri, 4 Oct 2019 15:21:45 +0000 (15:21 +0000)]
streamer: add missing copyright headers
Ariadne Conill [Fri, 4 Oct 2019 15:17:32 +0000 (15:17 +0000)]
tests: streamer: add a test for blocked transitive activities
Steven Fuchs [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
remove remaining errors from tests
Egor Kislitsyn [Mon, 16 Sep 2019 10:03:37 +0000 (17:03 +0700)]
Revert "Merge branch 'revert-
4fabf83a' into 'develop'"
This reverts commit
fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to
4fabf83ad01352442906d79187aeab4c777f4df8.
rinpatch [Fri, 4 Oct 2019 13:23:01 +0000 (13:23 +0000)]
Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
Remove in-db configuration references from 1.1
See merge request pleroma/pleroma!1781
rinpatch [Fri, 4 Oct 2019 12:51:48 +0000 (15:51 +0300)]
Remove in-db configuration references from 1.1
It's still too unstable to be used.
kaniini [Mon, 30 Sep 2019 16:40:46 +0000 (16:40 +0000)]
Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'
Pleroma 1.0.90 (aka 1.1 RC1).
See merge request pleroma/pleroma!1754
Ariadne Conill [Mon, 30 Sep 2019 16:38:34 +0000 (16:38 +0000)]
Pleroma 1.0.90 (aka 1.1 RC1).
kaniini [Mon, 30 Sep 2019 16:37:45 +0000 (16:37 +0000)]
Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'
Transmogrifier: Handle compact objects in undos.
See merge request pleroma/pleroma!1753
lain [Mon, 30 Sep 2019 16:13:05 +0000 (18:13 +0200)]
Transmogrifier: Handle compact objects in undos.
rinpatch [Mon, 30 Sep 2019 16:16:22 +0000 (16:16 +0000)]
Merge branch 'cherry-pick-
7c9b023a' into 'maint/1.1'
Backport !1749 to 1.1
See merge request pleroma/pleroma!1751
kaniini [Mon, 30 Sep 2019 15:37:03 +0000 (15:37 +0000)]
Merge branch 'ci/build-otp-maint' into 'develop'
CI: Enable OTP release building for maint/* branches
See merge request pleroma/pleroma!1749
(cherry picked from commit
7c9b023a918c84b60ae6547289a083c671a3659b)
71315800 CI: Enable OTP release building for maint/* branches
kaniini [Mon, 30 Sep 2019 15:35:47 +0000 (15:35 +0000)]
Merge branch 'chore/pleroma-fe-
20190930-to-maint' into 'maint/1.1'
maint/1.1: update pleroma fe
See merge request pleroma/pleroma!1750
Ariadne Conill [Mon, 30 Sep 2019 15:34:19 +0000 (15:34 +0000)]
update pleroma fe
rinpatch [Thu, 26 Sep 2019 06:11:52 +0000 (06:11 +0000)]
Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
Backport/1.1 hackney and outbox fixes
See merge request pleroma/pleroma!1718
rinpatch [Thu, 26 Sep 2019 06:03:20 +0000 (09:03 +0300)]
Linting
rinpatch [Wed, 25 Sep 2019 13:38:45 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
rinpatch [Wed, 25 Sep 2019 13:36:46 +0000 (16:36 +0300)]
Credo considered harmful
rinpatch [Wed, 25 Sep 2019 13:26:47 +0000 (16:26 +0300)]
Remove useless with clause
rinpatch [Wed, 25 Sep 2019 13:20:48 +0000 (13:20 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Wed, 25 Sep 2019 12:59:04 +0000 (15:59 +0300)]
Don't embed the first page in inboxes/outboxes and refactor the views to
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
Haelwenn (lanodan) Monnier [Wed, 25 Sep 2019 21:16:35 +0000 (23:16 +0200)]
mix.lock: Bump hackney to 1.15.2
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
kaniini [Thu, 19 Sep 2019 19:04:44 +0000 (19:04 +0000)]
Merge branch 'update/admin-fe-stable' into 'maint/1.1'
Update AdminFE for 1.1 branch
See merge request pleroma/pleroma!1693
Mark Felder [Wed, 18 Sep 2019 18:52:11 +0000 (13:52 -0500)]
Update AdminFE for 1.1 branch
Latest build of AdminFE with Settings disabled as the feature is not stable yet
rinpatch [Tue, 17 Sep 2019 19:49:10 +0000 (19:49 +0000)]
Merge branch 'cherry-pick-
764931fc' into 'maint/1.1'
Cherry pick tesla update to 1.1
See merge request pleroma/pleroma!1687
feld [Tue, 17 Sep 2019 19:37:29 +0000 (19:37 +0000)]
Merge branch 'deps/update-tesla' into 'develop'
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
(cherry picked from commit
764931fc9f5eecc30c1ccb3b5bacf6338fcdf706)
8d812c28 Update Tesla to 1.3
rinpatch [Sat, 14 Sep 2019 18:14:54 +0000 (18:14 +0000)]
Merge branch 'cherry-pick-
3ae448b5' into 'maint/1.1'
Backport a test fix to 1.1
See merge request pleroma/pleroma!1671
rinpatch [Sat, 14 Sep 2019 12:36:08 +0000 (12:36 +0000)]
Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
(cherry picked from commit
3ae448b592214b43af1d079c997c6f6b91d31aeb)
b870ae08 Fix `Activity.all_by_actor_and_id/2` test
rinpatch [Sat, 14 Sep 2019 18:14:21 +0000 (18:14 +0000)]
Merge branch 'cherry-pick-
9c64a257' into 'maint/1.1'
Backport config.md readdition to 1.1
See merge request pleroma/pleroma!1670
rinpatch [Sat, 14 Sep 2019 17:26:35 +0000 (17:26 +0000)]
Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
(cherry picked from commit
9c64a25713790fefa8b5c419aeadf55113c17073)
69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md
rinpatch [Sat, 14 Sep 2019 12:34:21 +0000 (12:34 +0000)]
Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'
Backport/fav reblog access control
See merge request pleroma/pleroma!1669
rinpatch [Sat, 14 Sep 2019 10:50:08 +0000 (10:50 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Sat, 14 Sep 2019 10:46:35 +0000 (10:46 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Fri, 13 Sep 2019 22:50:15 +0000 (01:50 +0300)]
Mastodon API: Respect post privacy in favourited/reblogged endpoints
lain [Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)]
Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
Haelwenn [Fri, 13 Sep 2019 12:46:16 +0000 (12:46 +0000)]
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
rinpatch [Fri, 13 Sep 2019 12:36:24 +0000 (12:36 +0000)]
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
Egor Kislitsyn [Wed, 28 Aug 2019 07:50:58 +0000 (14:50 +0700)]
Add a note about compatibility with Mastodon
Egor Kislitsyn [Fri, 13 Sep 2019 06:09:35 +0000 (13:09 +0700)]
Add email change endpoint