lain
4e022fc16c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain
5ffd20f3b5
Changelog: Add info about list fixes.
4 years ago
lain
fc42446755
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
...
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
4 years ago
lain
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Alexander Strizhakov
13f6029b4b
additional changelog entry
4 years ago
Alexander Strizhakov
fa23d5d3d3
changelog entry
4 years ago
lain
757410a177
Changelog: Add info about upload description changes
4 years ago
lain
e154fcf525
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
...
[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
4 years ago
Hugo
b2d3b26511
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Hugo Müller-Downing
317b6c6c52
Start :ssl if not started when running migration or rollback
4 years ago
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
lain
ebb30128af
Changelog: Add information about the object age policy
4 years ago
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Mary Kate
f785dba09b
changelog for filter whole_word fix
4 years ago
Mark Felder
cb7879c7c1
Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator
4 years ago
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
lain
2f4289d455
Changelog: Add info about email blacklist
4 years ago
lain
e26f2c9135
Changelog: Update with frontend mix task.
4 years ago
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
4 years ago
lain
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
4 years ago
lain
20d89472e3
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain
f715bf1915
Changelog: Include frontend information.
4 years ago
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
feld
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
4 years ago
Maksim Pechnikov
7991ddad58
added warning to use old keys
4 years ago
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
4 years ago
Maksim Pechnikov
b620290dd9
update description
4 years ago
Mark Felder
b157b7dab3
Document the emoji packs API fix
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
Maksim Pechnikov
3edaecae96
added welcome email
4 years ago
Dym Sohin
531c3ab9f3
fix markdown rendering withing <details>; typo parent**s**_visible
4 years ago
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
4 years ago
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
4 years ago
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
e82060c472
Update CHANGELOG.md
4 years ago
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
4 years ago
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
4 years ago
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
4 years ago
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
...
We really only want to strip location data anyway, and mogrify strips color profiles.
4 years ago
Mark Felder
0517d3252e
Probably worth documenting the MediaProxy fix
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
4 years ago
eugenijm
c2be0da79f
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn (lanodan) Monnier
31fef95e35
Add changelog and documentation
4 years ago
Haelwenn
a8447c3803
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
...
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
4 years ago
Mark Felder
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
4 years ago
lain
92e6801c17
Changelog: Add info about avatar removal
4 years ago
Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
4 years ago
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain
58da575935
Changelog: Document description limits.
4 years ago
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Mark Felder
991bd78dda
Document the Captcha CSP fix
4 years ago
lain
cbf2fe9649
Update changelog
4 years ago
lain
ef4c16f6f1
Update changelog
4 years ago
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
4 years ago
Mark Felder
02d855b2b9
Document the new API extension of /api/v1/instance
4 years ago
lain
ce9b7c0e0f
Changelog: Update with stream changes.
4 years ago
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
4 years ago
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
Mark Felder
76313e8162
Document breaking change of hide_notification_details setting
4 years ago
Mark Felder
fd5e797379
Simplify notification filtering settings further
4 years ago
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
1702239428
Changelog: Put info under API header.
4 years ago
lain
79ee914bc2
Changelog: Add info about parent_visible field
4 years ago
Roman Chvanikov
1471b70ef1
Merge develop
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
rinpatch
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
4 years ago
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
4 years ago
lain
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
4 years ago
Alexander Strizhakov
0c739b423a
changelog entry
4 years ago
Alexander Strizhakov
9a82de219c
formatting
4 years ago
Alexander Strizhakov
abda3f2d92
suggestion for changelog
4 years ago
rinpatch
281ecd6b30
CHANGELOG.md: mention minimal elixir version update
4 years ago
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
href
ec1452fd1c
Pleroma.MIME: use gen_magic
4 years ago
lain
4733f6a337
Changelog: Add info about `only_media` changes.
4 years ago
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
1092b36500
Changelog: Add info about conversation view changes.
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch
d050d21103
Apply suggestion to CHANGELOG.md
4 years ago
rinpatch
ffd12d3a1e
CHANGELOG.md: add 2.0.7 entry
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
feld
6d902916dd
Merge branch 'features/mix-task-reset-mfa' into 'develop'
...
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
4 years ago
Mark Felder
e505e59d9c
Document new mix task feature to reset mfa
4 years ago
Mark Felder
c2048f75cd
Add changelog entry for emoji pack reload command
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
rinpatch
f05f206e13
CHANGELOG.md: add 2.0.6 entry
4 years ago
Roman Chvanikov
604a83ae3e
merge develop
4 years ago
lain
e213e31577
Changelog: Add chats to changelog.
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
Alex Gleason
d38f28870e
Add blob: to connect-src CSP
4 years ago
Mark Felder
9eea800026
Refactor notification settings
4 years ago
rinpatch
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
4 years ago
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
4 years ago
lain
3506e95499
Add Changelog
4 years ago
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
4 years ago
lain
2a74565090
Changelog: Add background to instance
4 years ago
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Stephanie Wilde-Hobbs
3eff542678
Add Changelog entry
4 years ago
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
4 years ago
Roman Chvanikov
8a383707ae
Merge develop
4 years ago
rinpatch
6430df851d
CHANGELOG.md: add 2.0.5 entry
4 years ago
rinpatch
489201d5d5
CHANGELOG.md: mention AP C2S change
4 years ago
rinpatch
69e1f23dd3
CHANGELOG.md: Add 2.0.4 entry
4 years ago
rinpatch
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
4 years ago
Roman Chvanikov
4c19702390
Add docs
4 years ago
rinpatch
30eaef9d61
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
4 years ago
rinpatch
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
4 years ago
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
4 years ago
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
4 years ago
lain
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
lain
7dd47bee82
Update changelog
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
rinpatch
e0d392c04c
CHANGELOG.md: Add 2.0.3 changelog
4 years ago
rinpatch
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
4 years ago
rinpatch
9a92e5a351
Reword changelog entry for follow relationship bug
4 years ago
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
9855018425
changelog entry
4 years ago
Alexander Strizhakov
f3070ddae5
removing entry from changelog
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
4 years ago
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
lain
5a3a5abc0c
Changelog: Add info about `/api/v1/instance` changes
4 years ago