lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
Alexander Strizhakov
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Haelwenn (lanodan) Monnier
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/ ">
2020-02-15 00:36:09 +01:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
feld
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
2020-02-06 16:08:23 +00:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
lain
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
Thomas Citharel
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>
2019-12-17 16:16:21 +01:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
Egor Kislitsyn
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
2019-12-05 14:55:48 +07:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
Maksim Pechnikov
ed7f850ad2
fix test
2019-12-04 16:22:01 +03:00
Egor Kislitsyn
624e720aa4
Add with_move query param to the notifications API
2019-12-03 22:13:38 +07:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
lain
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
2019-11-27 14:48:28 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized users.mutes as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User
2019-11-12 18:45:28 +07:00
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
Ivan Tashkinov
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
2019-10-20 20:43:18 +03:00
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
2019-10-18 15:46:46 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
