lain
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
feld
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
4 years ago
lain
cc52f03566
Changelog: Add info about search changes
4 years ago
Ivan Tashkinov
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
Haelwenn
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
4 years ago
rinpatch
1eda5ab267
CHANGELOG.md: Move rum fix entry to patch section
...
Also includes minor cosmetical fixes.
4 years ago
lain
3b86ad0744
Changelog: Document breaking change.
4 years ago
lain
1bad91cba2
Changelog: Add info about the websearch option
4 years ago
lain
2ee0fc194a
Changelog: Add info about search fixes.
4 years ago
lain
21eaaf491c
Changelog: Add info about reset tokens
4 years ago
Alexander Strizhakov
44f3795b8e
changelog entries for fixes
4 years ago
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
1d03ba4ffb
Fixed emoji reactions not being filtered from blocked and muted accounts
4 years ago
feld
a1056aace1
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
...
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
4 years ago
lain
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
4 years ago
lain
1b63aa0b4f
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
d7b63272b8
Changelog: Move api info to api heading.
4 years ago
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder
56d95203b5
Document fixing the pleroma.user delete_activities mix task
4 years ago
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
rinpatch
11d8fefa7b
CHANGELOG.md: Use a period after every bullet point for unreleased sections
...
It has been the de-facto style for a while now, however it is not
enforced, so there were some entries that didn't use it.
4 years ago
rinpatch
ba214f3f16
CHANGELOG.md: Add back an entry for S3 fix
4 years ago
rinpatch
77c239f309
Import stable commits into develop after releasing 2.2.0
...
Updates the frontend bundle and syncs the changelog.
4 years ago
Mark Felder
5cbaa76fd6
Document S3 and Elixir 1.11 compat fix
4 years ago
Haelwenn
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
...
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
4 years ago
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
4 years ago
lain
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
Ilja
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
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
4 years ago
lain
b0e4e0cf2a
Changelog: Add info about title injection
4 years ago
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn
af3f00292c
Fix formatting
4 years ago
lain
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
4 years ago
rinpatch
6166ecdbc8
CHANGELOG.md: Add an entry for the spoofing fix
4 years ago
Haelwenn
4d693b5e54
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
4 years ago
feld
48f7e12e6c
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
...
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
4 years ago
feld
86b4149a13
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
4 years ago
lain
5ddf0be208
Changelog: Add info about admin email user link changes.
4 years ago
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
4 years ago
lain
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
4 years ago
lain
eb1e1e7494
Changelog: Add info about federation status endpoint
4 years ago
rinpatch
7058cac1c2
Merge branch '2257-self-chat' into 'develop'
...
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
4 years ago
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain
f09bb814a9
Changelog: Add info about poll view changes
4 years ago