Commit graph

12642 commits

Author SHA1 Message Date
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
Haelwenn
db07b538a5 Merge branch 'remove/release-env' into 'develop'
Remove release_env

See merge request pleroma/pleroma!3124
2020-11-09 09:14:41 +00:00
Sean King
e4a21084f0 Fix title on load of Pleroma HTML 2020-11-08 16:16:20 -07:00
lain
abf2ec2bbe Update optimizing_beam.md 2020-11-08 09:45:35 +00:00
rinpatch
cc45c69fff Remove release_env
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
 docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
 though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
2020-11-08 11:56:09 +03:00
Mark Felder
a9c1f83fd8 Markdown, you're drunk 2020-11-06 13:16:22 -06:00
Mark Felder
4999549191 Make it clearer the settings go into the vm.args file 2020-11-06 13:15:21 -06:00
Mark Felder
620f1d7237 More grammar fixes 2020-11-06 13:12:13 -06:00
Mark Felder
da1862e1d3 Less confusing I hope 2020-11-06 13:04:13 -06:00
Mark Felder
9e90e49ad2 Grammar 2020-11-06 13:02:07 -06:00
Mark Felder
60fe4a8393 First draft of tips for optimizing BEAM 2020-11-06 13:00:31 -06:00
Haelwenn (lanodan) Monnier
e010bb292b
NoteHandlingTest: Poison → Jason 2020-11-06 14:04:03 +01:00
Haelwenn (lanodan) Monnier
fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest 2020-11-06 08:57:16 +01: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
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
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
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
lain
294628d981 Merge branch 'feature/expire-mutes' into 'develop'
Expiring mutes for users and activities

Closes #1817

See merge request pleroma/pleroma!2971
2020-11-05 12:44:16 +00:00
lain
9b2ed14277 Docs: Add info about expiring mutes. 2020-11-05 13:23:58 +01:00
lain
4e7418d963 Merge branch 'stats-genserver-fix' into 'develop'
don't run  Stats GenServer updates in tests

See merge request pleroma/pleroma!2976
2020-11-04 16:15:04 +00:00
lain
5ddf0be208 Changelog: Add info about admin email user link changes. 2020-11-04 17:13:34 +01:00
lain
6d850c46dc AdminEmail: Use AP id as user url. 2020-11-04 17:12:47 +01:00
lain
d8d4e96230 Merge branch 'default-mrf' into 'develop'
Add TagPolicy as default MRF

See merge request pleroma/pleroma!2834
2020-11-04 15:54:12 +00:00
lain
7bbc328d66 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix 2020-11-04 16:52:30 +01:00
lain
dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes 2020-11-04 16:51:42 +01:00
lain
78cea44553 Merge branch 'ejabberd-pleroma-auth' into 'develop'
Add ejabberd auth document

See merge request pleroma/pleroma!3074
2020-11-04 15:42:48 +00:00
lain
4800ee656b Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances

See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
lain
5db4c823b2 Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline

See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
Ivan Tashkinov
73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-11-04 17:48:10 +03:00
Haelwenn
9c09ea01aa Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls

See merge request pleroma/pleroma!3120
2020-11-04 14:44:45 +00:00
lain
eb1e1e7494 Changelog: Add info about federation status endpoint 2020-11-04 15:39:32 +01:00
lain
504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status 2020-11-04 15:38:10 +01:00
lain
cb3cd3a761 TopicsTest: Small addition. 2020-11-04 15:24:10 +01: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
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
lain
329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
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
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
lain
bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users

Closes #2230

See merge request pleroma/pleroma!3116
2020-11-04 13:48:15 +00:00
Egor Kislitsyn
ca95cbe0b4
Add with_muted param to ChatController.index/2 2020-11-04 16:40:12 +04:00
lain
e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api 2020-11-04 13:23:18 +01:00
lain
c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-04 11:47:41 +01:00
lain
92d252f364 Poll Schema: Update and fix. 2020-11-04 10:20:09 +01:00
lain
f09bb814a9 Changelog: Add info about poll view changes 2020-11-04 10:14:48 +01:00