0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
5 years ago
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
768c1a5de1
Fix tests
5 years ago
27cd1374e3
Add a notification for Move activities
5 years ago
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
5 years ago
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
b39b49cc14
report federating status in nodeinfo
5 years ago
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
5 years ago
94627baa5c
New rate limiter
5 years ago
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
8521553ad9
User: Don't let deactivated users authenticate.
5 years ago
5cf2c7422b
[ #1335 ] Applied code review suggestions.
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
31343e4321
Code style fixes
5 years ago
6a4201e0b4
fix for migrate task
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
5 years ago
9d0b989521
add subject to atom feed
5 years ago
3cc49cdb78
Formatter moved to new module.
5 years ago
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
5 years ago
4729027f91
Prevent non-local notices from rendering.
5 years ago
886a07ba57
Move static_fe config to its own section instead of in :instance.
5 years ago
b0080fa730
Render errors in HTML, not with JS.
5 years ago
e27c61218d
Expand subject content automatically when config is set.
5 years ago
bfd5d79826
Include metadata in static FE conversations and profiles.
5 years ago
828259fb65
Catch 404s.
5 years ago
df2f59be91
Pagination for user profiles.
5 years ago
8969c5522d
Make many of the improvements suggested in review.
5 years ago
e8bee35578
Static FE plug should only respond to text/html requests.
5 years ago
dc3b87d153
Move static FE routing into its own plug.
...
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
5 years ago
c6c706161e
Make sure notice link is remote if the post is remote.
5 years ago
274cc18e8a
Visually separate header.
5 years ago
2ac1ece652
Fix a bug where reblogs were displayed under the wrong user.
5 years ago
5d7c44266b
Change date formatting.
5 years ago
1dc785b74b
Move static-fe CSS to a separate file.
5 years ago
e4b9784c39
Show counts for replies, likes, and announces for selected notice.
...
Using text instead of an icon, for now.
5 years ago
93e9c0cedf
Format dates using CommonAPI utils.
5 years ago
918e1353f6
Add header to profile/notice pages linking to pleroma-fe.
5 years ago
33a26b61c3
Remove activity/user representer; move logic to controller.
5 years ago
41fde63def
Get rid of @data in views and use separate fields.
5 years ago
e944a2213d
Use gettext for sensitive media warning.
5 years ago
2d1897e8a7
Apply all suggested changes from reviewers.
5 years ago
cc1b07132f
Notices should show entire thread from context.
5 years ago
748d800acb
Show images, video, and audio attachments to notices.
5 years ago
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
5 years ago
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
5 years ago
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
5 years ago
c1fc139986
Add permalinks to the static-fe notice rendering.
5 years ago
d1320160f4
Looks like source_data is on user directly now.
5 years ago
ca5ef201ef
static fe: add remote follow button
5 years ago
b33fbd58e3
static fe: add support for message subjects
5 years ago
e2904b5777
static fe: reformat activity representer
5 years ago
2b5bd5236d
static fe: add user profile rendering
5 years ago
8f08da750a
static fe: use a generic activity representer to render activities
5 years ago
ff8d0902f3
static fe: formatting
5 years ago
a4d3a8ec03
static fe: proof of concept
5 years ago
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
5 years ago
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
5 years ago
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7258db023e
Support old flag format
5 years ago
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
32afa07995
Fetcher: fix local check returning unwrapped object
...
This resulted in error messages about failed refetches being logged.
5 years ago
802d249827
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
...
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Closes #1385
See merge request pleroma/pleroma!1944
5 years ago
365657320c
Fix TrailingFormatPlug not being active for /api/oauth_tokens
5 years ago
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
5 years ago
f171095960
Grouped reports with status data baked in
5 years ago
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
5 years ago
e1fc6cb78f
Check client and token in GET /oauth/authorize
5 years ago
e52955c961
update following_relationship.ex
5 years ago
62bc0657e7
excluded invisible users from search results
5 years ago
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
5 years ago
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
5 years ago
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
5271bbcf11
add missing tesla mocks
5 years ago
06cc77e6fb
Merge branch 'faster-user-deactivation' into 'develop'
...
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
5 years ago
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
5 years ago
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
5 years ago
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
5 years ago
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
1b83a0694a
Fix moderation log crash
5 years ago
743b622b7b
Force password reset for multiple users
5 years ago
d75934b0d0
Undo dialyzer fix
5 years ago
ced9f92327
Fix count
5 years ago
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
59a149c69a
Fix "the call ... will never return" warning
5 years ago
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
61fc739ab8
Handle "Move" activity
5 years ago
363e76d4da
Fix duplicate recipients
5 years ago
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
77cfb08b8c
Remove commented-out code
5 years ago
0c361eeb25
Add pending to handle incoming for Follow activity
5 years ago
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
5 years ago
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
d56bc62275
Fix report parsing
5 years ago
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
5 years ago
653054d301
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
...
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
5 years ago
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
dbee53c2df
Remove unused Pleroma.User.info_fields/0
5 years ago
2ab072f949
object fetcher error handling
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
b08b1d5d91
Store status data inside Flag activity
5 years ago
c0246309a5
[ #1304 ] Extra bullet-proofing.
5 years ago
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
5 years ago
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
5 years ago
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
c6fba62666
Fix Relay
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
b4cbf0568b
[ #1304 ] Analysis issue fix.
5 years ago
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
95871cb462
user: implement User.invisible?/1
5 years ago
1469a084d4
relay: set invisible to true
5 years ago
e7333db72a
user info: add invisible field
5 years ago
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
5 years ago
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
638457ba94
MastoFE: Add PWA manifest.
5 years ago
fd6d05dc45
Merge branch 'mix-emoji-task-pack-json' into 'develop'
...
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
5 years ago
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
152caef51d
Direct messages should provide a distinct push notification subject
5 years ago
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
44e64af5e7
object: containment: simplify the pattern match for OStatus testsuite hack
5 years ago
e99fdfc32d
object: containment: only allow OStatus references in test suite environment
5 years ago
3c785b85a6
object: fetcher: fix up formatting
5 years ago
bae96de273
activitypub: tag containment checks for better error tracing
5 years ago
7295a05cee
object: containment: also allow OStatus object IDs through when comparing origins
5 years ago
a177f22e02
object: fetcher: improve error reporting
5 years ago
bf2107743f
object: containment: don't try to contain ostatus objects
5 years ago
6f110fc04c
object fetcher: fix up error handling
5 years ago
48059c03c9
fix up some tests
5 years ago
d379b48769
kill almost all of the OStatus module
5 years ago
6a1f4c5145
federator: remove OStatus incoming document support
5 years ago
835ad52378
remove Salmon module
5 years ago
beb9861f9d
router: disconnect Salmon
5 years ago
a7b92bba68
webfinger: stop pulling Salmon data out of WebFinger
5 years ago
c00ae10af8
feed: don't advertise salmon endpoint
5 years ago
adb639db56
publisher: move remote_users() from Salmon module
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
b16a460916
federator: remove websub stuff
5 years ago
25b7ff56c3
application: don't start Federator.init/1 anymore
5 years ago
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
5 years ago
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
5 years ago
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
5 years ago
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
0a5175ecbb
Order fts results by trigram
5 years ago
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
5 years ago
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
90d516d42b
Store status data inside flag activity
5 years ago
e7bb762ec2
don't stream in benchmark env
5 years ago
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
5 years ago
1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
5 years ago
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
5 years ago
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
5 years ago
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
5 years ago
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
aa7fd616c7
Line is too long!
5 years ago
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
d580eedfe9
Linting.
5 years ago
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
5 years ago
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
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
5 years ago
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
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
5 years ago
fefbd31c6e
Move local keys out of `user.info`
5 years ago
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
5 years ago
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
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
5 years ago
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
5 years ago
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
5 years ago
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
5 years ago
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
5 years ago
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
791d93ff0e
Make credo happy
5 years ago
977e711e22
Import object from self-Announce whenever possible
5 years ago
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
5 years ago
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
83631752af
removed legacy api: "/objects/:uuid/likes"
5 years ago
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
5 years ago
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
5 years ago
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
d1d058bf85
streamer: worker: actually use should_send? consistently
5 years ago
5a0c018d2a
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
2417b633ed
streamer: add missing copyright headers
5 years ago
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
568a995d64
ActivityPub: Change addressing of Undo.
5 years ago
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
5 years ago
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
5 years ago
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
5 years ago
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
5 years ago
Phil Hagelberg