f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
05d678c070
Expose user email address to user/owner; not publicly.
3 years ago
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
3 years ago
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
3 years ago
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
1e6c27181e
expires_in in scheduled status params
4 years ago
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
b5d001fc8c
not used mock
4 years ago
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
6bfd497f4a
Include own_votes in the poll data
4 years ago
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
4 years ago
80ccdb56f6
Make tag urls absolute
4 years ago
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
4 years ago
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
4 years ago
9ba60f70d2
Tests: Make as many tests as possible async.
...
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
4 years ago
b4b68b71fc
Tests: Remove unneeded explicit cachex use.
...
Only use cachex when we're actually testing it.
4 years ago
35ba48494f
Stream follow updates
4 years ago
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
4 years ago
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
4 years ago
2254e5e595
Render blurhashes in Mastodon API
4 years ago
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
c37118e6f2
Conversations: A few refactors
4 years ago
1042c30fa5
ConversationViewTest: fix test
4 years ago
630eb0f939
ConversationViewTest: fix test #2
4 years ago
149589c842
ConversationViewTest: fix test
4 years ago
Alex Gleason