958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
f7e59c28ed
Change user.approval_pending field to user.is_approved
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
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
4 years ago
e802b48d55
User: Use ObjectID type to validate also-known-as field
4 years ago
95a0ae8a35
AccountControllerTest: Fix test logic
4 years ago
0e93775ed0
Add test to validate profile pagination works with keyset
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
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
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
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
4 years ago
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
35ba48494f
Stream follow updates
4 years ago
fc9ebe5073
Search tests: Use on_exit for restoring `persistent_term` state
...
Otherwise if the assertion failed, the code below which resets the
state would never be reached
4 years ago
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
67b15cc033
Search: Save detected pg version in a persistent term.
4 years ago
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
8532325d65
SearchController Test: Fix test.
4 years ago
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
4 years ago
783fa797bb
SearchController Test: Fix test
4 years ago
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
415481a4d9
Add test for POST when push is disabled
...
Also group together the tests verifiying failure when disabled
4 years ago
3eaa5335c9
Revert adding extra alert types here
4 years ago
d9732fb7d3
Fix incorrect test description
4 years ago
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
4 years ago
30f140e570
Ensure all supported push notification subscription alert types are tested
4 years ago
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
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
0118ccb53c
Add `local` visibility
4 years ago
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
4 years ago
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
4 years ago
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
feld