rinpatch
9960383925
.gitattributes: Treat js/css/source maps as binary files
...
This prevents `git grep` from showing the matching line and diffs from
being shown by default.
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
Haelwenn
651fade275
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3127
4 years ago
rinpatch
b1fc9fe951
mix.exs: bump development version to 2.2.50 after 2.2.0 release
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
lain
81293e5aad
ActivityPubController: Don't return local only objects
4 years ago
Haelwenn (lanodan) Monnier
3f69680ed9
mix.exs: Update tesla to 1.4.0
4 years ago
lain
ffc2bb70ff
Gitlab CI: Specify image architecture for arm64 images
4 years ago
Guy Sheffer
26b74f4c58
Added translation using Weblate (Hebrew)
4 years ago
lain
a81f0a4a7d
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
...
Fix S3 uploads with Elixir 1.11
See merge request pleroma/pleroma!3148
4 years ago
lain
9d4797f61b
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
...
Use absolute URLs to thumbnail and background in /api/v1/instance
See merge request pleroma/pleroma!3149
4 years ago
Mark Felder
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Mark Felder
5cbaa76fd6
Document S3 and Elixir 1.11 compat fix
4 years ago
Mark Felder
eea962fc10
Fix S3 uploads with Elixir 1.11
4 years ago
Maksim Pechnikov
e4b202d905
added test
4 years ago
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov
e1d25bad0c
fix tests
4 years ago
Alex Gleason
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
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
Maksim Pechnikov
36ec604521
added test
4 years ago
lain
fcb1e7b750
Gitlab CI: Change tags bag to arm32
4 years ago
lain
27108acd0f
Gitlab CI: Alpine is alpine
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
lain
0597571fca
Merge branch 'docs/otp-tuning' into 'develop'
...
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
4 years ago
lain
1d3f916991
Gitlab CI: Specify arm32v7 image for arm32 builds
4 years ago
Maksim Pechnikov
1830b6aae5
added error messages for posix error code
4 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
4 years ago
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
4 years ago
feld
74179e6ac3
Merge branch 'majic-dep' into 'develop'
...
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
4 years ago
Michael Walker
c09813193a
Install file-dev in Dockerfile build stage
...
This is required by the majic, added in #2534 .
4 years ago
rinpatch
6e7963cca1
Merge branch 'build-release/fix-release-builds' into 'stable'
...
.gitlab-ci.yml: Add libmagic to installed packages for OTP releases
See merge request pleroma/pleroma!3134
4 years ago
rinpatch
3a6aa103d3
.gitlab-ci.yml: Add libmagic to installed packages for OTP releases
4 years ago
rinpatch
1172844ed1
Merge branch 'release/2.2.0' into 'stable'
...
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
4 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
4 years ago
Haelwenn
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
4 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
4 years ago
Mark Felder
966663c3f8
Fix tests for other attachment types
4 years ago
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
4 years ago
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
4 years ago
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
4 years ago
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
4 years ago
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
4 years ago
Egor Kislitsyn
81145ecdf5
Fix markdown
4 years ago
Egor Kislitsyn
d26a449396
Change endpoint path
4 years ago
lain
b0e4e0cf2a
Changelog: Add info about title injection
4 years ago
lain
25bd64b03a
Bundled FE: Remove title tag
4 years ago
feld
911fc3c523
Merge branch 'mrf-config-descriptions' into 'develop'
...
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
4 years ago