Mark Felder
eea962fc10
Fix S3 uploads with Elixir 1.11
3 years ago
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
3 years ago
Haelwenn
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
3 years ago
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
3 years ago
lain
fcb1e7b750
Gitlab CI: Change tags bag to arm32
3 years ago
lain
27108acd0f
Gitlab CI: Alpine is alpine
3 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
3 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)
3 years ago
lain
0597571fca
Merge branch 'docs/otp-tuning' into 'develop'
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
3 years ago
lain
1d3f916991
Gitlab CI: Specify arm32v7 image for arm32 builds
3 years ago
rinpatch
157e32a39c
Merge branch 'fix/oban-in-database-config' into 'develop'
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
3 years ago
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
3 years ago
feld
74179e6ac3
Merge branch 'majic-dep' into 'develop'
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
3 years ago
Michael Walker
c09813193a
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534 .
3 years ago
rinpatch
1172844ed1
Merge branch 'release/2.2.0' into 'stable'
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
3 years ago
rinpatch
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
3 years ago
Haelwenn
99bc175f02
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
3 years ago
feld
ccec59047b
Merge branch 'feature/ingest-blurhash' into 'develop'
Ingest blurhash for attachments if they were federated
Closes #2294
See merge request pleroma/pleroma!3133
3 years ago
Mark Felder
966663c3f8
Fix tests for other attachment types
3 years ago
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88b
3 years ago
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
3 years ago
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
3 years ago
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
3 years ago
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
3 years ago
Egor Kislitsyn
81145ecdf5
Fix markdown
3 years ago
Egor Kislitsyn
d26a449396
Change endpoint path
3 years ago
lain
b0e4e0cf2a
Changelog: Add info about title injection
3 years ago
lain
25bd64b03a
Bundled FE: Remove title tag
3 years ago
feld
911fc3c523
Merge branch 'mrf-config-descriptions' into 'develop'
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
3 years ago
Egor Kislitsyn
435bf1f945
Remove FrontendInstallerWorker
3 years ago
lain
631def2df2
RedirectController: Don't replace title, but inject into the meta
3 years ago
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
3 years ago
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
3 years ago
Egor Kislitsyn
af3f00292c
Fix formatting
3 years ago
Egor Kislitsyn
0118ccb53c
Add `local` visibility
3 years ago
feld
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
3 years ago
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
3 years ago
Alexander Strizhakov
e58ea7f99c
changes after rebase
3 years ago
Alexander Strizhakov
f97f24b067
making credo happy and test fix
3 years ago
Alexander Strizhakov
efc27f6464
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
3 years ago
feld
7681b4c5cd
Apply 1 suggestion(s) to 1 file(s)
3 years ago
feld
776067a9a3
Apply 1 suggestion(s) to 1 file(s)
3 years ago
feld
952a8c213e
Apply 1 suggestion(s) to 1 file(s)
3 years ago
feld
2933658446
Apply 1 suggestion(s) to 1 file(s)
3 years ago
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
3 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
3 years ago
lain
d77fd6b3d0
Merge branch 'fix/html-title-load' into 'develop'
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
3 years ago
lain
4a3d1e78f6
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
3 years ago
Alexander Strizhakov
0c68b9ac13
escaping summary and other fields in xml templates
3 years ago
Haelwenn
db07b538a5
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
3 years ago