alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,676 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6676 Commits

Author SHA1 Message Date
kaniini 4168ead672 Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1' 
backport MR 1779 to maint/1.1

See merge request pleroma/pleroma!1791
 2019-10-04 22:37:45 +00:00
Ariadne Conill 2714caac8b update changelog 2019-10-04 22:27:14 +00:00
Haelwenn (lanodan) Monnier dbd78de176 notification_view.ex: Make sure `account` isn’t empty 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
 2019-10-04 22:27:07 +00:00
kaniini 43be47c161 Merge branch 'backport/hex-flake-id' into 'maint/1.1' 
backport: hex `flake_id` support

See merge request pleroma/pleroma!1793
 2019-10-04 22:11:34 +00:00
kaniini 15513f02d0 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
 2019-10-04 22:01:38 +00:00
Ariadne Conill c19e539d37 changelog 2019-10-04 22:00:18 +00:00
Egor Kislitsyn 67d772dd73 Replace `Pleroma.FlakeId` with `flake_id` hex package 2019-10-04 21:59:17 +00:00
Sergey Suprunenko 7307d7d676 Track failed proxy urls and don't request them again 2019-10-04 21:49:51 +00:00
kaniini 1dd6d81ddf Merge branch 'backport/issue-1296' into 'maint/1.1' 
backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790
 2019-10-04 21:47:34 +00:00
Ariadne Conill a859abed2e update changelog 2019-10-04 21:36:49 +00:00
Maksim Pechnikov 16a1f95623 removed legacy api: "/objects/:uuid/likes" 2019-10-04 21:36:04 +00:00
kaniini 923dff21b3 Merge branch 'backport/undo-fixes' into 'maint/1.1' 
backport: undo fixes

See merge request pleroma/pleroma!1789
 2019-10-04 21:29:01 +00:00
Ariadne Conill 0f1486ed4e update changelog 2019-10-04 21:18:38 +00:00
lain a0435dca26 ActivityPub.Utils: Fix undo test. 2019-10-04 21:17:52 +00:00
lain b7d2ca0372 ActivityPub: Change addressing of Undo. 2019-10-04 21:17:46 +00:00
kaniini 4d38e48558 Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1' 
Sync 1.1.0 changelog with develop

See merge request pleroma/pleroma!1787
 2019-10-04 18:23:33 +00:00
rinpatch 3a923be434 Remove entries from develop that were in the section for some reason 2019-10-04 21:19:17 +03:00
rinpatch c921e32a44 Add back streaming fix entry 2019-10-04 21:17:29 +03:00
rinpatch bfc92946e5 Sync 1.1.0 changelog with develop 
Mostly !1724 backport, but as a new commit because it was easier
this way
 2019-10-04 21:16:06 +03:00
kaniini ca6f1644aa 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
 2019-10-04 17:39:28 +00:00
kaniini 222c238e7b Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1' 
Backport !1777 to 1.1

See merge request pleroma/pleroma!1786
 2019-10-04 17:39:20 +00:00
rinpatch 6b7cd7d850 Fix get_cached_by_nickname_or_id not allowing to get local users by 
nickname

Closes #1293
 2019-10-04 20:26:48 +03:00
Ariadne Conill d9e0108baa tests: add missing ExUnit.CaptureLog 2019-10-04 16:45:14 +00:00
Ariadne Conill 17fed5ae52 application: fix up after_supervisor_start removal backport 2019-10-04 16:15:54 +00:00
Ariadne Conill e951c547f7 update changelog 2019-10-04 16:06:25 +00:00
Ariadne Conill abb967671a streamer: worker: actually use should_send? consistently 2019-10-04 16:06:20 +00:00
Ariadne Conill d0e874c7f2 streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 16:06:14 +00:00
Ariadne Conill 51b317a602 streamer: add missing copyright headers 2019-10-04 16:06:08 +00:00
Ariadne Conill 4305ddef0a tests: streamer: add a test for blocked transitive activities 2019-10-04 16:06:00 +00:00
Steven Fuchs a2e92a1b8a remove remaining errors from tests 2019-10-04 16:05:22 +00:00
Egor Kislitsyn 7d5f20b50f Revert "Merge branch 'revert-4fabf83a' into 'develop'" 
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
 2019-10-04 16:01:31 +00:00
rinpatch a553ed5427 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
 2019-10-04 13:23:01 +00:00
rinpatch 1e6aa10168 Remove in-db configuration references from 1.1 
It's still too unstable to be used.
 2019-10-04 16:17:27 +03:00
kaniini 70d18a278c 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
 2019-09-30 16:40:46 +00:00
Ariadne Conill 5bfd4006ae Pleroma 1.0.90 (aka 1.1 RC1). 2019-09-30 16:39:20 +00:00
kaniini 57101955b6 Merge branch 'cherry-pick-compact-undos' into 'maint/1.1' 
Transmogrifier: Handle compact objects in undos.

See merge request pleroma/pleroma!1753
 2019-09-30 16:37:45 +00:00
lain 565b8d02c8 Transmogrifier: Handle compact objects in undos. 2019-09-30 16:25:26 +00:00
rinpatch 56c91d1323 Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1' 
Backport !1749 to 1.1

See merge request pleroma/pleroma!1751
 2019-09-30 16:16:22 +00:00
kaniini 96e1db1cf1 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 7c9b023a91)

71315800 CI: Enable OTP release building for maint/* branches
 2019-09-30 15:41:10 +00:00
kaniini 4f3b8d5399 Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1' 
maint/1.1: update pleroma fe

See merge request pleroma/pleroma!1750
 2019-09-30 15:35:47 +00:00
Ariadne Conill 979f66a99c update pleroma fe 2019-09-30 15:34:19 +00:00
rinpatch 2b98ef832c 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
 2019-09-26 06:11:52 +00:00
rinpatch 6d1ca73466 Linting 2019-09-26 09:03:20 +03:00
rinpatch 4c6e5639d3 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 2019-09-26 03:46:33 +03:00
rinpatch cfd9f73f0d Credo considered harmful 2019-09-26 03:46:26 +03:00
rinpatch 9d32f38b39 Remove useless with clause 2019-09-26 03:46:17 +03:00
rinpatch 22a16a3e81 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-26 03:46:10 +03:00
rinpatch d4a76b0a6f 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.
 2019-09-26 03:45:58 +03:00
Haelwenn (lanodan) Monnier e91f0e2801 mix.lock: Bump hackney to 1.15.2 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
 2019-09-26 03:27:36 +03:00
kaniini 53b4daa514 Merge branch 'update/admin-fe-stable' into 'maint/1.1' 
Update AdminFE for 1.1 branch

See merge request pleroma/pleroma!1693
 2019-09-19 19:04:44 +00:00