Commits · 99bc175f0257fb0cb9275cba94df662ed219eacf · Pleroma / pleroma

12 Nov, 2020 1 commit
- Merge branch 'title-injection-change' into 'develop' · 99bc175f
  Haelwenn authored Nov 12, 2020
```
Title injection change

See merge request !3132
```
  99bc175f
11 Nov, 2020 13 commits
- Merge branch 'feature/ingest-blurhash' into 'develop' · ccec5904
  feld authored Nov 11, 2020
```
Ingest blurhash for attachments if they were federated

Closes #2294

See merge request !3133
```
  ccec5904
- Fix tests for other attachment types · 966663c3
  feld authored Nov 11, 2020
  
  966663c3
- Ingest blurhash field during transmogrification · 2156de2f
  feld authored Nov 11, 2020
  
  2156de2f
- Render blurhashes in Mastodon API · 2254e5e5
  feld authored Nov 11, 2020
  
  2254e5e5
- Ingest blurhash for attachments if they were federated · 6fd72e9e
  feld authored Nov 11, 2020
  
  6fd72e9e
- Changelog: Add info about title injection · b0e4e0cf
  lain authored Nov 11, 2020
  
  b0e4e0cf
- Bundled FE: Remove title tag · 25bd64b0
  lain authored Nov 11, 2020
  
  25bd64b0
- Merge branch 'mrf-config-descriptions' into 'develop' · 911fc3c5
  feld authored Nov 11, 2020
```
little changes for MRF config descriptions

See merge request !3131
```
  911fc3c5
- RedirectController: Don't replace title, but inject into the meta · 631def2d
  lain authored Nov 11, 2020
  
  631def2d
- little changes for MRF config descriptions · 8da9f919
  Alexander Strizhakov authored Nov 11, 2020
```
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
```
  8da9f919
- Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' · 3cd7ea69
  feld authored Nov 11, 2020
```
Config descriptions for custom MRF policies

Closes #2222

See merge request !3128
```
  3cd7ea69
- making credo happy and test fix · f97f24b0
  Alexander Strizhakov authored Nov 11, 2020
  
  f97f24b0
- fix for adminFE · efc27f64
  Alexander Strizhakov authored Nov 11, 2020
```
- revert UserAllowPolicy description
- MRF descriptions order
```
  efc27f64
10 Nov, 2020 5 commits
- config descriptions for custom MRF policies · 485697d9
  Alexander Strizhakov authored Nov 10, 2020
  
  485697d9
- Merge branch '2260-wrong-report-link' into 'develop' · 88f6b61a
  lain authored Nov 10, 2020
```
Resolve "Wrong user link in Report email"

Closes #2260

See merge request !3121
```
  88f6b61a
- Merge branch 'fix/html-title-load' into 'develop' · d77fd6b3
  lain authored Nov 10, 2020
```
Fix title on load of Pleroma HTML, fixes #2281

Closes #2281

See merge request !3125
```
  d77fd6b3
- Merge branch 'fix/2291-atom-feed-escape' into 'develop' · 4a3d1e78
  lain authored Nov 10, 2020
```
Escaping in xml templates

Closes #2291

See merge request !3126
```
  4a3d1e78
- escaping summary and other fields in xml templates · 0c68b9ac
  Alexander Strizhakov authored Nov 10, 2020
  
  0c68b9ac
09 Nov, 2020 1 commit
- Merge branch 'remove/release-env' into 'develop' · db07b538
  Haelwenn authored Nov 09, 2020
```
Remove release_env

See merge request !3124
```
  db07b538
08 Nov, 2020 2 commits

Fix title on load of Pleroma HTML · e4a21084
Sean King authored Nov 08, 2020

e4a21084

rinpatch authored Nov 07, 2020

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.

cc45c69f

05 Nov, 2020 2 commits
- Merge branch 'feature/expire-mutes' into 'develop' · 294628d9
  lain authored Nov 05, 2020
```
Expiring mutes for users and activities

Closes #1817

See merge request !2971
```
  294628d9
- Docs: Add info about expiring mutes. · 9b2ed142
  lain authored Nov 05, 2020
  
  9b2ed142
04 Nov, 2020 16 commits
- Merge branch 'stats-genserver-fix' into 'develop' · 4e7418d9
  lain authored Nov 04, 2020
```
don't run  Stats GenServer updates in tests

See merge request !2976
```
  4e7418d9
- Changelog: Add info about admin email user link changes. · 5ddf0be2
  lain authored Nov 04, 2020
  
  5ddf0be2
- AdminEmail: Use AP id as user url. · 6d850c46
  lain authored Nov 04, 2020
  
  6d850c46
- Merge branch 'default-mrf' into 'develop' · d8d4e962
  lain authored Nov 04, 2020
```
Add TagPolicy as default MRF

See merge request !2834
```
  d8d4e962
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix · 7bbc328d
  lain authored Nov 04, 2020
  
  7bbc328d
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes · dd2b3a8d
  lain authored Nov 04, 2020
  
  dd2b3a8d
- Merge branch 'ejabberd-pleroma-auth' into 'develop' · 78cea445
  lain authored Nov 04, 2020
```
Add ejabberd auth document

See merge request !3074
```
  78cea445
- Merge branch 'features/federation-status' into 'develop' · 4800ee65
  lain authored Nov 04, 2020
```
Add a federation_status endpoint showing unreachable instances

See merge request !3086
```
  4800ee65
- Merge branch 'restrict-domain' into 'develop' · 5db4c823
  lain authored Nov 04, 2020
```
View a remote server's timeline

See merge request !2713
```
  5db4c823
- Merge branch '2284-voters-count' into 'develop' · 9c09ea01
  Haelwenn authored Nov 04, 2020
```
Always return voters_count in polls

See merge request !3120
```
  9c09ea01
- Changelog: Add info about federation status endpoint · eb1e1e74
  lain authored Nov 04, 2020
  
  eb1e1e74
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status · 504a829e
  lain authored Nov 04, 2020
  
  504a829e
- TopicsTest: Small addition. · cb3cd3a7
  lain authored Nov 04, 2020
  
  cb3cd3a7
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into... · 329aa19c
  lain authored Nov 04, 2020
```
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
```
  329aa19c
- Merge branch 'hide-muted-chats' into 'develop' · bc4d9c4f
  lain authored Nov 04, 2020
```
Hide chats from muted users

Closes #2230

See merge request !3116
```
  bc4d9c4f
- Add `with_muted` param to ChatController.index/2 · ca95cbe0
  minibikini authored Nov 04, 2020
  
  ca95cbe0