Commit graph

12058 commits

Author SHA1 Message Date
rinpatch 3a6aa103d3 .gitlab-ci.yml: Add libmagic to installed packages for OTP releases 2020-11-12 16:14:15 +03: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 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
Alexander Strizhakov e58ea7f99c changes after rebase 2020-11-11 11:42:52 +03:00
rinpatch 6166ecdbc8 CHANGELOG.md: Add an entry for the spoofing fix 2020-11-05 16:33:51 +03:00
rinpatch 5116859f0e Merge branch 'fix/object-attachment-spoof' into 'develop'
Fix object spoofing vulnerability in attachments

See merge request pleroma/secteam/pleroma!18
2020-11-05 16:32:54 +03:00
Haelwenn 4d693b5e54 Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"

Closes #2236

See merge request pleroma/pleroma!3101
2020-11-05 16:32:50 +03:00
Mark Felder 79caf3840e phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+ 2020-11-05 16:26:10 +03:00
feld 48f7e12e6c Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes

See merge request pleroma/pleroma!3053
2020-11-05 16:23:56 +03:00
feld 86b4149a13 Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions

Closes #1668

See merge request pleroma/pleroma!3093
2020-11-05 16:22:35 +03:00
rinpatch 5f27a39152 Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"

Closes #2242

See merge request pleroma/pleroma!3094
2020-11-05 16:19:44 +03:00
feld 88dc1d24b9 Merge branch 'issue/2261' into 'develop'
[#2261] FrontStatic plug: excluded invalid url

See merge request pleroma/pleroma!3106
2020-11-05 16:18:56 +03:00
rinpatch 7058cac1c2 Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"

Closes #2257

See merge request pleroma/pleroma!3099
2020-11-04 17:12:37 +03:00
feld 6c8469664a Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
2020-11-04 17:05:21 +03:00
feld 49b43e668e Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes #1516

See merge request pleroma/pleroma!2931
2020-11-04 17:00:50 +03:00
feld fa6ad67397 Merge branch 'tesla-get-to-pleroma' into 'develop'
Use Pleroma.HTTP instead of Tesla

Closes #2275

See merge request pleroma/pleroma!3113
2020-11-04 16:57:37 +03:00
rinpatch fb0e340363 Rip out fedsockets from the release branch 2020-10-21 21:14:58 +03:00
rinpatch 274c8e6fab SECURITY.md: update supported versions to only 2.2 2020-10-15 21:45:31 +03:00
rinpatch 6c1bc9ca39 CHANGELOG.md: prepare 2.2.0 changelog 2020-10-15 21:43:46 +03:00
rinpatch 65b73eb9fd mix.exs: bump version to 2.2.0 2020-10-15 21:43:35 +03:00
feld b48724afcd Merge branch 'docs-indigenous' into 'develop'
Change handle and url of contact person for Indigenous client

See merge request pleroma/pleroma!3082
2020-10-14 20:31:23 +00:00
swentel 42112b842c Change handle and url of contact person for Indigenous client 2020-10-14 21:32:18 +02:00
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
Haelwenn 9a85ec0da0 Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked

See merge request pleroma/pleroma!3077
2020-10-14 16:17:32 +00:00
Mark Felder ed61002815 Undo API breaking changes 2020-10-14 11:03:17 -05:00
Mark Felder 8b20c4d275 Missed tests 2020-10-13 16:15:28 -05:00
Haelwenn 481906207e Merge branch 'bugfix/file-consistency-prod' into 'develop'
Move Consistency.FileLocation to ./test

See merge request pleroma/pleroma!3079
2020-10-13 18:19:24 +00:00
Haelwenn (lanodan) Monnier f5d8af1db1
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
2020-10-13 19:57:45 +02:00
Mark Felder 09be8cb336 Credo 2020-10-13 12:49:43 -05:00
Mark Felder 40f3cdc030 JPEG content_type must be image/jpeg 2020-10-13 10:37:24 -05:00
Mark Felder b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field 2020-10-13 09:54:29 -05:00
feld 8b6221d4ec Merge branch 'feature/1822-files-consistency' into 'develop'
Feature/1822 files consistency

Closes #1822

See merge request pleroma/pleroma!2680
2020-10-13 14:47:29 +00:00
Mark Felder 9968b7efed Change user.locked field to user.is_locked 2020-10-13 09:31:13 -05:00
Alexander Strizhakov 4c4ea9a348
changes after rebase 2020-10-13 17:10:34 +03:00
Alexander Strizhakov 3cb9c88837
migration and warning for RemoteIp plug rename 2020-10-13 16:44:04 +03:00
Alexander Strizhakov 5f2071c458
changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov bb111465a1
credo fix after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov 7f5dbb0201
changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov b081080dd9
fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov f679486540
rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov c4c5caedd8
changes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov 1d0e130cb3
fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov 7f82f18664
exclude file_location check from coveralls 2020-10-13 16:44:01 +03:00
Alexander Strizhakov c8418e2d1f
fix after rebase 2020-10-13 16:44:01 +03:00
Alexander Strizhakov b720ad2264
files consistency after rebase 2020-10-13 16:44:01 +03:00
Alexander Strizhakov c5efded5fd
files consistency for new files 2020-10-13 16:44:00 +03:00
Alexander Strizhakov 0f8ab46a0e
fix after rebase 2020-10-13 16:44:00 +03:00
Alexander Strizhakov 207211a2b3
update files consistency after rebase 2020-10-13 16:44:00 +03:00