Commits · 69b089c894e69d4a3cb8a9122e3afe3acf4251ac · Pleroma / pleroma

18 Jan, 2022 2 commits
- Merge branch 'erratic-allow-failure' into 'develop' · 69b089c8
  Alex Gleason authored Jan 18, 2022
```
unit-testing-erratic: allow failure

See merge request !3606
```
  69b089c8
- Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop' · 72d5e291
  Alex Gleason authored Jan 18, 2022
```
[Document] Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`.

See merge request !3604
```
  72d5e291
15 Jan, 2022 8 commits
- unit-testing-erratic: allow failure · ac434f83
  Alex Gleason authored Jan 15, 2022
  
  ac434f83
- Merge branch 'linkify-0.5.2' into 'develop' · ecdc81b3
  Alex Gleason authored Jan 15, 2022
```
Upgrade Linkify to v0.5.2

Closes #2376, #2386, and #2485

See merge request !3605
```
  ecdc81b3
- mix format · 39c5ebb1
  Alex Gleason authored Jan 15, 2022
  
  39c5ebb1
- CHANGELOG: hashtags markdown fix · cd8f1aac
  Alex Gleason authored Jan 15, 2022
  
  cd8f1aac
- FormatterTest: fix nesting in expected output · 31148c18
  Alex Gleason authored Jan 15, 2022
  
  31148c18
- Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2 · db90c9e3
  Alex Gleason authored Jan 15, 2022
  
  db90c9e3
- Upgrade Linkify to v0.5.2 · d5eb44e8
  Alex Gleason authored Jan 15, 2022
  
  d5eb44e8
- Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`. · 79008154
  Hakaba Hitoyo authored Jan 15, 2022
  
  79008154
14 Jan, 2022 4 commits
- Merge branch 'show_blockers_visible' into 'develop' · 71baa713
  Alex Gleason authored Jan 14, 2022
```
Add blockers_visible to features list when it's enabled

See merge request !3603
```
  71baa713
- Add blockers_visible to features list when it's enabled · 62843530
  NEETzsche authored Jan 14, 2022 and Alex Gleason committed Jan 14, 2022
  
  62843530
- Merge branch 'mergeback' into 'develop' · 8b5a6589
  rinpatch authored Jan 14, 2022
```
Merge stable back into develop

Closes #2753

See merge request !3602
```
  8b5a6589
- Merge remote-tracking branch 'origin/stable' into mergeback · a4436bcc
  Alex Gleason authored Jan 14, 2022
  
  a4436bcc
13 Jan, 2022 1 commit
- Merge branch 'account-endorsements' into 'develop' · 84dcb55b
  Alex Gleason authored Jan 13, 2022
```
Account endorsements

See merge request !3601
```
  84dcb55b
12 Jan, 2022 2 commits
- Add more tests · eedf551e
  marcin mikołajczak authored Jan 12, 2022
```
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
```
  eedf551e
- WIP account endorsements · 0f90fd58
  marcin mikołajczak authored Jan 10, 2022
```
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
```
  0f90fd58
11 Jan, 2022 8 commits
- Merge branch 'release/2.4.2' into 'stable' · 62a45747
  rinpatch authored Jan 11, 2022
```
2.4.2 Release

See merge request !3599
```
  62a45747
- CI: Conservatively update release images so they keep building. · b34f0a6e
  lain authored Nov 14, 2021 and rinpatch committed Jan 11, 2022
  
  b34f0a6e
- CI: Upload the image for all platforms · e4cfdfd7
  lain authored Nov 15, 2021 and rinpatch committed Jan 11, 2022
```
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
```
  e4cfdfd7
- Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf · a98a1277
  rinpatch authored Jan 11, 2022
  
  a98a1277
- mix.lock: sync with mix.exs · ea204dbc
  rinpatch authored Jan 10, 2022
```
hackney version was bumped in mix.exs, but mix.lock was not updated
```
  ea204dbc
- Add 2.4.2 changelog entry and bump mix version · f4bc2f59
  rinpatch authored Jan 10, 2022
  
  f4bc2f59
- Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' · cd3175c7
  Alex Gleason authored Jan 10, 2022 and rinpatch committed Jan 11, 2022
```
Escape unicode RTL overrides in rich media parser tests

See merge request !3598
```
  cd3175c7
- Merge branch 'pleroma-result-1_13' into 'develop' · bf0b32c9
  lain authored Dec 07, 2021 and rinpatch committed Jan 11, 2022
```
move result into with guard

See merge request !3557
```
  bf0b32c9
10 Jan, 2022 4 commits

Merge remote-tracking branch 'origin/develop' into account-endorsements · 4f249b23
marcin mikołajczak authored Jan 10, 2022

4f249b23
Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' · 753a9b3f
Alex Gleason authored Jan 10, 2022
```
Escape unicode RTL overrides in rich media parser tests

See merge request !3598
```
753a9b3f

Escape unicode RTL overrides in rich media parser tests · fd043b0a

rinpatch authored Jan 10, 2022

Elixir 1.13 does not allow them in raw form anymore, resulting in errors
like this when running the test:

== Compilation error in file test/pleroma/web/rich_media/parser_test.exs ==
** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead

fd043b0a

Merge branch 'update-hackney' into 'develop' · 991b26f4
lain authored Dec 01, 2021 and rinpatch committed Jan 10, 2022
```
Mix: upgrade Hackney to 1.18.0

Closes #2753

See merge request !3549
```
991b26f4

07 Jan, 2022 2 commits
- Merge branch 'api-docs-fixes' into 'develop' · 2451d65b
  Alex Gleason authored Jan 07, 2022
```
Docs: fix various Pleroma API endpoints paths, fix MFA response

See merge request !3596
```
  2451d65b
- Docs: fix various Pleroma API endpoints paths, fix MFA response · e8b340aa
  Alex Gleason authored Jan 07, 2022
  
  e8b340aa
02 Jan, 2022 2 commits
- Merge branch 'change/web-push-encryption-dep' into 'develop' · a3094b64
  Alex Gleason authored Jan 02, 2022
```
Upgrade web_push_encryption to 0.3.1

See merge request !3592
```
  a3094b64
- Upgrade web_push_encryption to 0.3.1 · bf995a77
  Sean King authored Jan 01, 2022
  
  bf995a77
01 Jan, 2022 2 commits
- Merge branch 'change/concurrent-limiter-dep' into 'develop' · c8026fe4
  Alex Gleason authored Jan 01, 2022
```
Change concurrent_limiter to version 0.1.1

See merge request !3591
```
  c8026fe4
- Change concurrent_limiter to Hex PM version 0.1.1 · 91ea394c
  Sean King authored Jan 01, 2022
  
  91ea394c
31 Dec, 2021 2 commits
- Merge branch 'erratic-streamer-test' into 'develop' · 86e692ae
  Alex Gleason authored Dec 31, 2021
```
StreamerTest: tag erratic test

See merge request !3590
```
  86e692ae
- StreamerTest: tag erratic test · 2ae86784
  Alex Gleason authored Dec 31, 2021
  
  2ae86784
30 Dec, 2021 1 commit
- Merge branch 'more-efficient-ci' into 'develop' · e25af3f2
  lain authored Dec 30, 2021
```
CI: Use own package as base

See merge request !3577
```
  e25af3f2
29 Dec, 2021 2 commits
- Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop' · 84420d94
  lain authored Dec 29, 2021
```
Added index on [:target_id, :relationship_type] to :user_relationships

See merge request !3588
```
  84420d94
- `mix format` · a7bdefc2
  Ivan Tashkinov authored Dec 29, 2021
  
  a7bdefc2