cf99b1c1fd
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
...
Specify the architecture for arm gitlab jobs
See merge request pleroma/pleroma!3139
2020-11-17 14:52:08 +00:00
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
2020-11-17 18:30:10 +04:00
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
2020-11-17 17:28:30 +03:00
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
2020-11-17 14:16:53 +00:00
fbd6217ed9
Merge branch 'feature/local-only-scope' into 'develop'
...
Add local-only statuses
Closes #75 and #1483
See merge request pleroma/pleroma!2289
2020-11-17 14:08:45 +00:00
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
9b9afe6b3f
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'
...
Debian installation guide: fix libmagic header package name
See merge request pleroma/pleroma!3154
2020-11-17 13:24:01 +00:00
f711a41933
Debian installation guide: fix libmagic header package name
...
It's libmagic-dev in both Ubuntu and Debian.
Reported in private by NaiJi.
2020-11-17 16:11:37 +03:00
c7536f16cb
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
...
.gitattributes: Treat js/css/source maps as binary files
See merge request pleroma/pleroma!3153
2020-11-17 12:55:09 +00:00
83ec4aadd6
Merge branch 'chores/tesla_1.4.0' into 'develop'
...
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
2020-11-17 12:42:51 +00:00
6c3273892f
Merge branch 'sync-stable/2.2.0' into 'develop'
...
Import stable commits into develop after releasing 2.2.0
Closes #2275 , #1516 , #2257 , #2242 , #1668 , and #2236
See merge request pleroma/pleroma!3151
2020-11-17 12:40:42 +00:00
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.
2020-11-17 15:38:28 +03:00
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.
2020-11-17 15:21:46 +03:00
ba214f3f16
CHANGELOG.md: Add back an entry for S3 fix
2020-11-17 15:20:57 +03:00
651fade275
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3127
2020-11-17 12:16:54 +00:00
b1fc9fe951
mix.exs: bump development version to 2.2.50 after 2.2.0 release
2020-11-17 15:14:35 +03:00
77c239f309
Import stable commits into develop after releasing 2.2.0
...
Updates the frontend bundle and syncs the changelog.
2020-11-17 15:14:25 +03:00
81293e5aad
ActivityPubController: Don't return local only objects
2020-11-17 13:11:39 +01:00
3f69680ed9
mix.exs: Update tesla to 1.4.0
2020-11-17 13:09:56 +01:00
ffc2bb70ff
Gitlab CI: Specify image architecture for arm64 images
2020-11-17 12:42:55 +01:00
26b74f4c58
Added translation using Weblate (Hebrew)
2020-11-17 11:15:01 +00:00
a81f0a4a7d
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
...
Fix S3 uploads with Elixir 1.11
See merge request pleroma/pleroma!3148
2020-11-17 11:14:50 +00:00
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
2020-11-17 11:12:20 +00:00
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
2020-11-16 21:29:15 +00:00
5cbaa76fd6
Document S3 and Elixir 1.11 compat fix
2020-11-16 19:54:02 +00:00
eea962fc10
Fix S3 uploads with Elixir 1.11
2020-11-16 19:51:44 +00:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
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
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
fcb1e7b750
Gitlab CI: Change tags bag to arm32
2020-11-13 16:19:09 +01:00
27108acd0f
Gitlab CI: Alpine is alpine
2020-11-13 14:48:40 +01:00
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
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
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
1d3f916991
Gitlab CI: Specify arm32v7 image for arm32 builds
2020-11-13 14:23:24 +01:00
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
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
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
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
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
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
966663c3f8
Fix tests for other attachment types
2020-11-11 16:17:35 -06:00
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
2020-11-11 23:28:15 +03:00
99edfba3da
Polish the changelog a bit and specify release date
2020-11-11 23:12:52 +03:00
2156de2fee
Ingest blurhash field during transmogrification
2020-11-11 13:39:02 -06:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
rinpatch