squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,173 Commits 154 Branches 42 Tags 503 MiB
a7b92bba68
Commit Graph

7173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
kaniini
99b312cbab Merge branch 'undo-fixes' into 'develop' 
ActivityPub: Change addressing of Undo.

See merge request pleroma/pleroma!1782
 2019-10-04 15:52:41 +00:00
Ariadne Conill
dbf5fce67e update changelog 2019-10-04 15:45:06 +00:00
Ariadne Conill
d1d058bf85 streamer: worker: actually use should_send? consistently 2019-10-04 15:42:25 +00:00
Ariadne Conill
5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 15:41:55 +00:00
Ariadne Conill
2417b633ed streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
Ariadne Conill
8325858ed2 tests: streamer: add a test for blocked transitive activities 2019-10-04 15:17:32 +00:00
lain
2a7f44acfe ActivityPub.Utils: Fix undo test. 2019-10-04 17:10:49 +02:00
lain
568a995d64 ActivityPub: Change addressing of Undo. 2019-10-04 16:32:42 +02:00
feld
31e57cd1b3 Merge branch 'develop' into 'fix/extended-nickname-format-default-config' 
# Conflicts:
#   CHANGELOG.md
 2019-10-04 14:16:28 +00:00
lain
27110793a7 Merge branch 'featrue/job-monitor' into 'develop' 
Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
 2019-10-04 12:52:11 +00:00
lain
27e914955e Merge branch 'fix/nickname-fail' into 'develop' 
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname

Closes #1293

See merge request pleroma/pleroma!1777
 2019-10-04 11:54:05 +00:00
rinpatch
8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by 
nickname

Closes #1293
 2019-10-04 14:44:09 +03:00
lain
01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop' 
notification_view.ex: Make sure `account` isn’t empty

See merge request pleroma/pleroma!1779
 2019-10-04 11:28:20 +00:00
lain
bc095a27f1 Merge branch 'fix/oauth-controller' into 'develop' 
Fix OAuthController

Closes #1294

See merge request pleroma/pleroma!1780
 2019-10-04 11:27:30 +00:00
Egor Kislitsyn
d3ac4e8083
Fix OAuthController 2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure account isn’t empty 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
 2019-10-04 07:11:53 +02:00
rinpatch
bdf188b2a6 Merge branch 'docs/frontend_configuration' into 'develop' 
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations

See merge request pleroma/pleroma!1778
 2019-10-03 22:22:47 +00:00
Haelwenn (lanodan) Monnier
e4ab9a05dd
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations 2019-10-04 00:10:28 +02:00
eugenijm
06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
rinpatch
4fe2af3b2d Merge branch 'mkdocs-migration-prep' into 'develop' 
MkDocs migration preparation

See merge request pleroma/pleroma!1774
 2019-10-03 15:43:03 +00:00
rinpatch
b2f2012a4f Remove a test branch from CI 2019-10-03 18:42:02 +03:00
Mark Felder
b8b98ac40f Add missing extended_nickname_format setting to the default config 2019-10-03 10:40:49 -05:00
rinpatch
69784eb75a Add a missing language specification 2019-10-03 15:10:04 +03:00
rinpatch
b5a43e301e Change docs build/deploy to just trigger a pipeline in the docs repo 2019-10-03 15:02:21 +03:00
rinpatch
1cae564b5d Move config task docs to a separate file and mark it as WIP 2019-10-03 14:12:57 +03:00
rinpatch
e00403af23 Mix tasks: derive moduledoc from doc files 2019-10-03 14:00:23 +03:00
rinpatch
6baa037903 Move database maintenance tasks docs to a separate file 2019-10-03 11:17:29 +03:00
rinpatch
8e08d5b233 MkDocs does not like if a paragraph doesn't have a newline after it 2019-10-03 11:02:07 +03:00
rinpatch
2656f41818 Remove silent mode note as it's no longer relevant 2019-10-03 10:57:27 +03:00
rinpatch
aefb4dcff5 Cheatsheet: Use note/warning blocks instead of bold text 2019-10-03 10:54:41 +03:00
rinpatch
e560d65db3 Fix a typo in activity expirations 2019-10-03 10:45:40 +03:00
rinpatch
25849157aa Remove fe settings from :instance as they no longer do anything 2019-10-03 10:43:38 +03:00
rinpatch
4e70009490 Move bold text in RemoveIp description into a proper warning 2019-10-03 10:39:53 +03:00
rinpatch
cb162678df Add missing language spec 2019-10-03 10:37:34 +03:00
rinpatch
66450f8615 Cheatsheet: Move the deprecated config warning into a warning block 2019-10-03 10:36:01 +03:00
rinpatch
2cbe2dcbde Oops 2019-10-03 10:31:59 +03:00
rinpatch
b4ca864c6b Move user tasks docs to a separate file 2019-10-03 10:15:24 +03:00
rinpatch
8fd47a4a5a Use consistent command signature 2019-10-03 09:38:24 +03:00
rinpatch
f5372bfb4a Fix up some headings 2019-10-03 09:36:35 +03:00
rinpatch
d39ccc2e7f Move uploads task docs to a separate file 2019-10-03 09:35:21 +03:00