Commits · mfc-develop · mfc / pleroma

07 Jan, 2021 2 commits
- Merge branch 'fix-template-warning' into 'mfc-develop' · 405dc738
  feld authored Jan 07, 2021
```
Fix phoenix template warning

Closes #30

See merge request mfc/pleroma!91
```
  405dc738
- Fix phoenix template warning · 628d9e8a
  minibikini authored Jan 07, 2021
  
  628d9e8a
06 Jan, 2021 11 commits
- Merge branch 'sync' into 'mfc-develop' · f02304f7
  feld authored Jan 06, 2021
```
Fix leftover from an imperfect merge of 165a4b2a

See merge request mfc/pleroma!90
```
  f02304f7
- Fix leftover from an imperfect merge of 165a4b2a · 3c3c44d1
  feld authored Jan 06, 2021
  
  3c3c44d1
- Merge branch 'merge/develop-20210106' into 'mfc-develop' · 02d1d38d
  feld authored Jan 06, 2021
```
Merge/develop 20210106

Closes pleroma/pleroma#2270, pleroma/pleroma#2346, and pleroma/secteam/pleroma#3

See merge request mfc/pleroma!89
```
  02d1d38d
- Migrate config description for CdnWarmingPolicy to the MRF module itself · e7ec8eac
  feld authored Jan 06, 2021
  
  e7ec8eac
- hotto -> howto · b4355fdd
  feld authored Jan 06, 2021
  
  b4355fdd
- More synchronization with develop · 9a93820f
  feld authored Jan 06, 2021
  
  9a93820f
- Fix order to match upstream · 223e5d19
  feld authored Jan 06, 2021
  
  223e5d19
- Add pagination for mutes and blocks · 59f2583e
  Roman Chvanikov authored Jan 06, 2021
  
  59f2583e
- Re-sync with develop branch. Several things absent/missed. · 9dbd25f9
  feld authored Jan 06, 2021
  
  9dbd25f9
- Merge branch 'develop' into merge/develop-20210106 · 3b293fd1
  feld authored Jan 06, 2021
  
  3b293fd1
- Merge branch 'merge/develop-20201028' into 'mfc-develop' · bc9dbeb2
  feld authored Jan 06, 2021
```
Merge/develop 20201028

See merge request mfc/pleroma!87
```
  bc9dbeb2
05 Jan, 2021 13 commits
- Merge branch 'fix/mediaproxy-config-descriptions' into 'develop' · 5e128a6b
  feld authored Jan 05, 2021
```
Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219
```
  5e128a6b
- Merge branch 'fix/emoji-encoding' into 'develop' · 18296c74
  lain authored Jan 05, 2021
```
URI.encode custom emojis

Closes #2381

See merge request pleroma/pleroma!3235
```
  18296c74
- Add test to validate URLs to custom emojis are properly encoded · f9090e00
  feld authored Jan 05, 2021
  
  f9090e00
- Add dinosaur gif from https://gifs.cc · 8864ac65
  feld authored Jan 05, 2021
```
"Our animations are free to be used to enhance your website."
```
  8864ac65
- URI.encode custom emojis · 64116f63
  feld authored Jan 05, 2021
  
  64116f63
- Merge branch 'fix/pagination-regression' into 'develop' · 20a269ed
  lain authored Jan 05, 2021
```
Do not try to guess which pagination we need by the existence of an :offset param.

Closes #2399

See merge request pleroma/pleroma!3230
```
  20a269ed
- Merge branch '1526-account-aliases' into 'develop' · 7a03b112
  lain authored Jan 05, 2021
```
Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request !3233
```
  7a03b112
- User: Use ObjectID type to validate also-known-as field · e802b48d
  lain authored Jan 05, 2021
  
  e802b48d
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases · f0e6cff5
  lain authored Jan 05, 2021
  
  f0e6cff5
- Merge branch 'pleroma-moderation-log-stuff' into 'develop' · ca7cf62d
  lain authored Jan 05, 2021
```
AdminAPI: return id for moderation log entries

See merge request pleroma/pleroma!3232
```
  ca7cf62d
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff · bea69853
  lain authored Jan 05, 2021
  
  bea69853
- AccountControllerTest: Fix test logic · 95a0ae8a
  lain authored Jan 05, 2021
  
  95a0ae8a
- Merge branch '2391-async-bugs' into 'develop' · b3c36d3f
  Haelwenn authored Jan 05, 2021
```
SideEffects.DeleteTest: asyncify.

Closes #2391

See merge request pleroma/pleroma!3231
```
  b3c36d3f
04 Jan, 2021 3 commits
- SideEffects.DeleteTest: asyncify. · 8e5904da
  lain authored Jan 04, 2021
```
Replace Mock with Mox, mock out Logger.
```
  8e5904da
- Add test to validate profile pagination works with keyset · 0e93775e
  feld authored Jan 04, 2021
  
  0e93775e
- Do not try to guess which pagination we need by the existence of an :offset param. · 83f27282
  feld authored Jan 04, 2021
```
Require explicit request to get offset pagination.
```
  83f27282
01 Jan, 2021 1 commit
- AdminAPI: return id for moderation log entries · 0ec7e9b8
  Alex Gleason authored Jan 01, 2021
  
  0ec7e9b8
31 Dec, 2020 8 commits
- Merge branch 'fix/reports-ordering' into 'develop' · afe9c152
  feld authored Dec 31, 2020
```
Do not reverse order of reports. We want newest ones sorted to the top.

Closes #2364

See merge request pleroma/pleroma!3225
```
  afe9c152
- Document reports ordering change · 83d97ab9
  feld authored Dec 31, 2020
  
  83d97ab9
- Aliases: refactor validate_also_known_as/1 · 4200a063
  Alex Gleason authored Dec 31, 2020
  
  4200a063
- Apply 2 suggestion(s) to 1 file(s) · 0d6b9ce8
  Alex Gleason authored Dec 31, 2020
  
  0d6b9ce8
- Ensure newest report is returned first in the list · e4791258
  feld authored Dec 31, 2020
  
  e4791258
- Merge branch 'fix/adminapi-user-status-pagination' into 'develop' · 70e8ef2c
  feld authored Dec 31, 2020
```
Support pagination in AdminAPI for user statuses

See merge request pleroma/pleroma!3226
```
  70e8ef2c
- Apply 1 suggestion(s) to 1 file(s) · 2aa60e75
  feld authored Dec 31, 2020
  
  2aa60e75
- Render AKAs in Actor endpoints · 11d40e92
  Alex Gleason authored Dec 30, 2020
  
  11d40e92
30 Dec, 2020 2 commits
- Merge remote-tracking branch 'upstream/develop' into aliases · cbce8800
  Alex Gleason authored Dec 30, 2020
  
  cbce8800
- Make pagination type conditional · 2597b028
  feld authored Dec 30, 2020
  
  2597b028