2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
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
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
05da5f5cca
Update Copyrights
5 years ago
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
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
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
5 years ago
f446744a6a
Allow account registration without an email
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
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
cd040691bd
maked `unread_count` as virtual field
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
2c40c8b4a2
Merge branch 'develop' into issue/1383
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
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
dabd535e43
Remove user recommendation by third party engine
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
de4102b247
can be changed in runtime
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
8589632d09
fixed delete ScheduledActivity
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
6e88a7e591
exclude blocked user posts from search results
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
34d85f8a54
Return 404 if account to filter notifications from is not found
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
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
e21afdb7c7
Merge branch 'develop' into issue/1411
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
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
652cc6ba4b
updated ScheduledActivity
5 years ago
624e720aa4
Add `with_move` query param to the notifications API
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
88f7cf51d4
Merge branch 'develop' into issue/1411
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
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
0937895182
updated fetch_favorites
5 years ago
9da4c88b49
fix test
5 years ago
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
b9041c2097
added recount unread notifications to markers
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
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
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
94627baa5c
New rate limiter
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
9d0b989521
add subject to atom feed
5 years ago
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
209319c8d2
update marker api
5 years ago
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
d4270397dc
Marker: added unread_count field
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
feld
