Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
2019-10-07 03:49:57 +02:00 |
|
kaniini
|
25cffffaf1
|
Merge branch 'fix/bad-migration' into 'develop'
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
|
2019-10-06 15:15:00 +00:00 |
|
rinpatch
|
ee88afb2e2
|
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
|
2019-10-06 18:06:04 +03:00 |
|
kaniini
|
2411d09215
|
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
|
2019-10-06 14:32:56 +00:00 |
|
rinpatch
|
125f96e706
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:23:43 +03:00 |
|
|
|
09a3b993fe
|
Merge branch 'fix/report-email' into 'develop'
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
|
2019-10-06 14:13:04 +00:00 |
|
|
|
1d8e956c32
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
2019-10-06 14:13:04 +00:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03:00 |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 11:43:49 +03:00 |
|
Ivan Tashkinov
|
f459aabdfa
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
2019-10-06 09:30:49 +03:00 |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
2019-10-06 04:41:06 +00:00 |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
2019-10-05 19:28:53 +00:00 |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
2019-10-05 19:28:29 +00:00 |
|
kaniini
|
17ff4b43cb
|
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
|
2019-10-05 19:28:07 +00:00 |
|
sadposter
|
f1c77f9682
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-05 18:22:05 +01:00 |
|
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
|
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 |
|
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 |
|
|
|
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 |
|
sadposter
|
8550e0ff0a
|
stickers
|
2019-10-04 12:04:31 +01:00 |
|
sadposter
|
59e6b48553
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-04 11:48:39 +01:00 |
|
sadposter
|
76c84720f7
|
stickers
|
2019-10-04 11:48:31 +01: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 |
|
