7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
4d71c4b805
fixed 'source' object in verify_credentials
4 years ago
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
4 years ago
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
4 years ago
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
4 years ago
46aae346f8
Move single used schemas to Filter operation schema
4 years ago
7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
babcae7130
Move single used schemas to Marker operation schema
4 years ago
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
4 years ago
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
4 years ago
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
e16437ff19
[ #1706 ] Formatting fix.
4 years ago
0d05e1fe39
[ #1706 ] Prevented error on unresolved activity actors for timeline actions.
4 years ago
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
5102468d0f
Polls: Persist and show voters' count
4 years ago
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
736fead494
Merge branch 'develop' into openapi/account
4 years ago
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 years ago
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
970b74383b
Credo fixes.
4 years ago
c845820911
Notifications: Create a chat notification.
4 years ago
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
ca598e9c27
AccountView: Return user ap_id.
4 years ago
cf4ebba774
Cleanup SubscriptionController
5 years ago
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
03124c96cc
Add spec for AccountController.statuses
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
ac672a9d6b
[ #1559 ] Addressed code review requests.
5 years ago
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
460e41585c
Further preloading (more endpoints), refactoring, tests.
5 years ago
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
5 years ago
8176ca9e40
static_fe: Sanitize HTML in users
5 years ago
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
5 years ago
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
05da5f5cca
Update Copyrights
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
2ef70b55f5
Fix `status.expires_at` type
5 years ago
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
5 years ago
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
5 years ago
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
de4102b247
can be changed in runtime
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
f595cfe623
Remove User.user_info/2
5 years ago
1fc28a4b44
Add a view for the move notification
5 years ago
80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
94f1cfced8
format the code
5 years ago
lain
