Mark Felder
5cbaa76fd6
Document S3 and Elixir 1.11 compat fix
2020-11-16 19:54:02 +00:00
Mark Felder
eea962fc10
Fix S3 uploads with Elixir 1.11
2020-11-16 19:51:44 +00:00
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
Haelwenn
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
...
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
2020-11-14 21:43:07 +00:00
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
lain
fcb1e7b750
Gitlab CI: Change tags bag to arm32
2020-11-13 16:19:09 +01:00
lain
27108acd0f
Gitlab CI: Alpine is alpine
2020-11-13 14:48:40 +01:00
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
2020-11-13 13:35:47 +00:00
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)
2020-11-13 13:35:46 +00:00
lain
0597571fca
Merge branch 'docs/otp-tuning' into 'develop'
...
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
2020-11-13 13:31:46 +00:00
lain
1d3f916991
Gitlab CI: Specify arm32v7 image for arm32 builds
2020-11-13 14:23:24 +01:00
rinpatch
157e32a39c
Merge branch 'fix/oban-in-database-config' into 'develop'
...
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
2020-11-13 10:32:16 +00:00
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
2020-11-13 09:07:08 +03:00
74179e6ac3
Merge branch 'majic-dep' into 'develop'
...
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
2020-11-12 22:41:00 +00:00
Michael Walker
c09813193a
Install file-dev in Dockerfile build stage
...
This is required by the majic, added in #2534 .
2020-11-12 22:20:17 +00:00
rinpatch
1172844ed1
Merge branch 'release/2.2.0' into 'stable'
...
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
2020-11-12 12:34:48 +00:00
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
2020-11-12 15:25:33 +03:00
Haelwenn
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
2020-11-12 08:50:26 +00:00
ccec59047b
Merge branch 'feature/ingest-blurhash' into 'develop'
...
Ingest blurhash for attachments if they were federated
Closes #2294
See merge request pleroma/pleroma!3133
2020-11-11 22:37:16 +00:00
Mark Felder
966663c3f8
Fix tests for other attachment types
2020-11-11 16:17:35 -06:00
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
2020-11-11 23:28:15 +03:00
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
2020-11-11 23:12:52 +03:00
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
2020-11-11 13:39:02 -06:00
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
Egor Kislitsyn
81145ecdf5
Fix markdown
2020-11-11 20:42:05 +04:00
Egor Kislitsyn
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
lain
b0e4e0cf2a
Changelog: Add info about title injection
2020-11-11 17:19:09 +01:00
lain
25bd64b03a
Bundled FE: Remove title tag
2020-11-11 17:17:41 +01:00
911fc3c523
Merge branch 'mrf-config-descriptions' into 'develop'
...
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
2020-11-11 16:15:57 +00:00
Egor Kislitsyn
435bf1f945
Remove FrontendInstallerWorker
2020-11-11 20:12:35 +04:00
lain
631def2df2
RedirectController: Don't replace title, but inject into the meta
2020-11-11 17:10:59 +01:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
Egor Kislitsyn
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
Egor Kislitsyn
0118ccb53c
Add local visibility
2020-11-11 18:54:01 +04:00
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
2020-11-11 13:48:03 +00:00
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
Alexander Strizhakov
e58ea7f99c
changes after rebase
2020-11-11 11:42:52 +03:00
Alexander Strizhakov
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
Alexander Strizhakov
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
2020-11-11 10:10:57 +03:00
7681b4c5cd
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:23 +00:00
776067a9a3
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:17 +00:00
952a8c213e
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:08 +00:00
2933658446
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:00 +00:00
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
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
2020-11-10 11:04:19 +00:00
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
2020-11-10 10:05:15 +00:00
lain
4a3d1e78f6
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
...
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
2020-11-10 09:34:13 +00:00
Alexander Strizhakov
0c68b9ac13
escaping summary and other fields in xml templates
2020-11-10 10:46:57 +03:00
