882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
4 years ago
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
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
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
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
9d5ce82221
Test: More async/sync tweaks.
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
3283d0805f
Use Jason instead of Poison in tests
4 years ago
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
4 years ago
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
4 years ago
966663c3f8
Fix tests for other attachment types
4 years ago
e010bb292b
NoteHandlingTest: Poison → Jason
4 years ago
fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest
4 years ago
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
3985c1b450
Fix warnings
4 years ago
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
4 years ago
5f2071c458
changes after rebase
4 years ago
b081080dd9
fixes after rebase
4 years ago
f679486540
rebase
4 years ago
c4c5caedd8
changes after rebase
4 years ago
c5efded5fd
files consistency for new files
4 years ago
e33782455d
updates after rebase
4 years ago
7dffaef479
tests consistency
4 years ago
Ivan Tashkinov