6bfd497f4a
Include own_votes in the poll data
2021-01-22 09:47:59 -06:00
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03:00
80ccdb56f6
Make tag urls absolute
2021-01-21 16:49:19 -06:00
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2020-12-26 22:23:05 +03:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
2020-12-21 22:54:26 +03:00
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.
2020-12-21 12:21:40 +01:00
b4b68b71fc
Tests: Remove unneeded explicit cachex use.
...
Only use cachex when we're actually testing it.
2020-12-18 13:18:17 +01:00
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
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
2020-11-13 13:35:47 +00:00
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)
2020-11-13 13:35:46 +00:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
1cfc3278c0
Poll View: Always return `voters_count`.
2020-11-04 10:14:00 +01:00
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
1042c30fa5
ConversationViewTest: fix test
2020-10-30 13:59:53 +01:00
630eb0f939
ConversationViewTest: fix test #2
2020-10-30 12:58:51 +01:00
149589c842
ConversationViewTest: fix test
2020-10-30 12:58:51 +01:00
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
40f3cdc030
JPEG content_type must be image/jpeg
2020-10-13 10:37:24 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
Mark Felder