Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,774 Commits 1 Branch 0 Tags 222 MiB
a6ee6784bc
Commit Graph

8774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
kaniini
0ee6100c8d Merge branch 'update-activity-fixes' into 'develop' 
Update activity fixes

Closes #1298

See merge request pleroma/pleroma!1795
 2019-10-05 15:51:19 +00:00
lain
1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 15:10:57 +02:00
lain
276a520163 CommonAPI: Create profile updates as public. 
This saves us lots of sending out because we can use sharedInbox.
 2019-10-05 14:53:50 +02:00
lain
4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 14:49:45 +02:00
Thibaut Girka
b1ff66dc5f Add test for handling Announces with inlined object from different origin 2019-10-05 13:56:40 +02:00
Thibaut Girka
791d93ff0e Make credo happy 2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22 Import object from self-Announce whenever possible 2019-10-05 13:56:40 +02:00
kaniini
e51c20f28a Merge branch 'revert-5c04e817' into 'develop' 
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

See merge request pleroma/pleroma!1794
 2019-10-05 10:00:44 +00:00
kaniini
e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" 
This reverts merge request !1737
 2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea Transmogrifier: Extend misskey like compatibility. 2019-10-05 10:45:42 +02:00
lain
d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 10:42:29 +02:00
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
9c47d8571c Merge branch 'issue/1296' into 'develop' 
[#1296] removed legacy api: "/objects/:uuid/likes"

See merge request pleroma/pleroma!1788
 2019-10-04 20:07:47 +00:00
Maksim Pechnikov
83631752af removed legacy api: "/objects/:uuid/likes" 2019-10-04 22:35:26 +03: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
kaniini
e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' 
widen streaming API block effects

See merge request pleroma/pleroma!1784
 2019-10-04 17:39:06 +00:00
kaniini
5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' 
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
 2019-10-04 17:33:18 +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
Maxim Filippov
8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once 2019-10-04 19:00:58 +03:00
Maxim Filippov
795ea5dfc2 Move HTTP verb to the header (admin_api.md) 2019-10-04 18:58:44 +03:00
kaniini
75e415d5f4 Merge branch 'fix/extended-nickname-format-default-config' into 'develop' 
Add missing extended_nickname_format setting to the default config

See merge request pleroma/pleroma!1776
 2019-10-04 15:53:47 +00:00