5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
30af5da330
Admin API: list all statuses from a given instance
5 years ago
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
5 years ago
94f1cfced8
format the code
5 years ago
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
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
7d101bc9c5
Fix rendering conversations when there's a malformed status
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
94627baa5c
New rate limiter
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
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
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
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
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
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
f171095960
Grouped reports with status data baked in
5 years ago
e1fc6cb78f
Check client and token in GET /oauth/authorize
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
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
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
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
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
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
61fc739ab8
Handle "Move" activity
5 years ago
0c361eeb25
Add pending to handle incoming for Follow activity
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
b777083f3f
Add `also_known_as` field to Pleroma.User
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
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
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
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
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
1469a084d4
relay: set invisible to true
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
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
bae96de273
activitypub: tag containment checks for better error tracing
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
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
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
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
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
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
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
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
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
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
d3ac4e8083
Fix OAuthController
5 years ago
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
5 years ago
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
64095961fe
[ #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
4cb603e1df
PleromaAPI: Add unreacting.
5 years ago
391c736292
PleromaAPI: Fix emoji_reactions_by
5 years ago
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
9cfe9a57c5
CommonAPI: Add unreactions.
5 years ago
d3c404af12
Add MastoFEController
5 years ago
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
5 years ago
1c6e1055c8
Add CustomEmojiController
5 years ago
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
5 years ago
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
5 years ago
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
3d61efa7c9
Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
5 years ago
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
5 years ago
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
43e3db0951
Fix returned visibility of announces in MastodonAPI
5 years ago
4c1f158f5d
Allow users to announce privately, including own private notes
5 years ago
b2273c695e
Discard identifier, if empty
5 years ago
fe538973dd
Ensure self-announces do not widen the audience of the original post
5 years ago
1f0be71ea4
Make activity announceable by its author.
5 years ago
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
5 years ago
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
19bc0b8c79
.
5 years ago
08256e9299
ActivityPub: Federate reactions.
5 years ago
6068d2254e
PleromaAPIController: Fixes and refactoring.
5 years ago
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
e7aef27c00
Fix merge
5 years ago
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
5 years ago
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
5 years ago
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
1d7cbdaf7b
change new scrobble endpoint
5 years ago
e653edd182
split scrobble functions into their own controller
5 years ago
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
5 years ago
8b34b221cb
common api: add some missing IR bits for listen activities' children
5 years ago
84712c35f9
activitypub: object view: include child object for Listen activities
5 years ago
71eff09e56
common api: make sure the generated IR is actually federatable
5 years ago
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
2c82d8603b
common api: implement scrobbling
5 years ago
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
5 years ago
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
5 years ago
f9380289eb
Add `remote_ip` plug
5 years ago
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
5 years ago
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
5 years ago
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
5 years ago
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
8d31530119
Cleanup ScheduledActivityView
5 years ago
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
6c7c35dbe1
Fix SubscriptionNotificationView
5 years ago
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
5 years ago
14294243a2
mastodon api: implement follow_requests_count
5 years ago
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
73ae38ca04
add deprecated tag
5 years ago
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
b4b147000c
Merge develop
5 years ago
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
c57ad0a402
Cleanup CommonAPI
5 years ago
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
f2880d7d29
Credo considered harmful
5 years ago
c7d8ccd0c4
Remove useless with clause
5 years ago
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
d87be2ec96
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.
5 years ago
118d6dcdf4
Fix nodeinfo handling
5 years ago
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
035f22f784
Fix Credo warnings
5 years ago
1bea67cb5e
Cleanup Pleroma.User
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
79b25be4e1
Do not return tuple when unneeded
5 years ago
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
5 years ago
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
e1d2d69c87
Clean up views
5 years ago
e63f167f01
Also pretty print pack.json
5 years ago
494bb6bac6
updated tests
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
2ad50583f0
Document and test /api/ap/whoami
5 years ago
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
72a01f1350
Use router helper to generate reset password link
5 years ago
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
0e6085da10
Fix pagination in AP outbox.json
5 years ago
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
b585134c90
Get the nodeinfo address from the well-known
5 years ago
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
d51e5e447e
Move emoji reloading to admin api
5 years ago
7680aec17d
Move emoji api to pleroma api dir
5 years ago
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
3971bf9c5f
Change :sha to :checksum
5 years ago
7c784128fd
Change emoji api responses to JSON
5 years ago
f24731788e
Move emoji pack list from /list to /
5 years ago
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
8f509e6d1e
Use with w/ pack_info_res
5 years ago
Ariadne Conill