Commits · 349b9d86dc25ae9514781ef2ac56953fa357a031 · Alex Gleason / pleroma

Apr 06, 2020
- Merge branch 'remake-remodel-2' into 'develop' · 349b9d86
  lain authored 4 years ago
  
  Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
  349b9d86
- ObjectID Validator: Refactor. · 772bc258
  lain authored 4 years ago
  
  772bc258
- Transmogrifier: Refactoring / Renaming. · e67cde0e
  lain authored 4 years ago
  
  e67cde0e
Apr 02, 2020
- Merge branch 'fix/docs-markdown' into 'develop' · 8444e7ee
  feld authored 5 years ago
  
  Fix formatting in documentation See merge request pleroma/pleroma!2348
  8444e7ee
- Fix formatting in documentation · 8a0ffaa9
  minibikini authored 5 years ago
  
  8a0ffaa9
- Merge branch '2323-accounts-relationships-hotfix' into 'develop' · 7879369e
  feld authored 5 years ago
  
  [#2323] Fixed /accounts/relationships Closes pleroma-fe#820 See merge request pleroma/pleroma!2347
  7879369e
- [#2323] Fixed a typo causing /accounts/relationships to render default... · aa783251
  Ivan Tashkinov authored 5 years ago
  
  [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
  aa783251
Apr 01, 2020
- Merge branch 'update/adminfe-20200331' into 'develop' · fd932b14
  feld authored 5 years ago
  
  Update AdminFE build in preparation for Pleroma 2.0.2 See merge request pleroma/pleroma!2343
  fd932b14
- Merge branch 'gun' into 'develop' · ef7d2b0f
  feld authored 5 years ago
  
  Gun adapter Closes #945 See merge request pleroma/pleroma!1861
  ef7d2b0f
- Validators: Correct ObjectID filename · 037b49c4
  lain authored 5 years ago
  
  037b49c4
- Merge branch 'fix/1601-add-new-meta-tag' into 'develop' · bfec45bf
  rinpatch authored 5 years ago
  
  Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341
  bfec45bf
- restrict remote users from indexing · 94ddbe40
  Alexander Strizhakov authored 5 years ago
  
  94ddbe40
- Merge branch 'ops/fix-ci' into 'develop' · c9f51ede
  Haelwenn authored 5 years ago
  
  Ops/fix ci See merge request pleroma/pleroma!2340
  c9f51ede
- remove testing `only:` in docker build · bcaaba46
  jp authored 5 years ago
  
  bcaaba46
- add imagemagick and update inherited container to alpine:3.11 · c2715ed7
  jp authored 5 years ago
  
  c2715ed7
Mar 31, 2020
- Merge branch 'fix/docker-mogrify' into 'develop' · ec5d6eef
  feld authored 5 years ago
  
  Remove problematic --cache-from argument See merge request pleroma/pleroma!2338
  ec5d6eef
- Remove problematic --cache-from argument · d3cd3b96
  feld authored 5 years ago
  
  d3cd3b96
- Merge branch 'bugfix/funkwhale-channel' into 'develop' · 7d3b25f0
  Haelwenn authored 5 years ago
  
  Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
  7d3b25f0
- Provide known-good user.uri, remove User.profile_url/1 · 185520d1
  Haelwenn authored 5 years ago
  
  185520d1
- User: Fix use of source_data in profile_url/1 · b30fb1f3
  Haelwenn authored 5 years ago
  
  b30fb1f3
- Initial failing test statement against funkwhale channels · 2553400a
  Haelwenn authored 5 years ago
  
  2553400a
- Merge branch 'fix/docker-mogrify' into 'develop' · fa38089f
  feld authored 5 years ago
  
  Fix/docker mogrify Closes #1644 See merge request pleroma/pleroma!2337
  fa38089f
- Add imagemagick to Docker image to fix broken mogrify plugin · f6dc3361
  feld authored 5 years ago
  
  f6dc3361
- Update AdminFE build in preparation for Pleroma 2.0.2 · 219d3aaa
  feld authored 5 years ago
  
  219d3aaa
- Transmogrifier: Fix BAD code by RINPATCH · c982093c
  lain authored 5 years ago
  
  c982093c
- Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex · 1b323ce1
  lain authored 5 years ago
  
  1b323ce1
- Transmogrifier: Only add context if it really is onne. · ecac5773
  lain authored 5 years ago
  
  ecac5773
- Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 · 51fc5047
  lain authored 5 years ago
  
  51fc5047
- Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex · 288f2b5a
  lain authored 5 years ago
  
  288f2b5a
- Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex · 0be1fa0a
  lain authored 5 years ago
  
  0be1fa0a
- CommonAPI: DRY up a bit. · 057438a6
  lain authored 5 years ago
  
  057438a6
- Validator Test: Small refactor. · aebec1ba
  lain authored 5 years ago
  
  aebec1ba
- Validators: ObjectID is an http uri. · 643f15e7
  lain authored 5 years ago
  
  643f15e7
- Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex · f6835333
  lain authored 5 years ago
  
  f6835333
Mar 30, 2020
- Merge branch 'benchmark-improvements' into 'develop' · 8bd5ad86
  lain authored 5 years ago
  
  Benchmark improvements See merge request pleroma/pleroma!2308
  8bd5ad86
- Merge branch 'removing-grouped-reports' into 'develop' · dabe3aeb
  rinpatch authored 5 years ago
  
  Removing grouped reports endpoint See merge request pleroma/pleroma!2335
  dabe3aeb
- removing grouped reports admin api endpoint · b607ae1a
  Alexander Strizhakov authored 5 years ago
  
  b607ae1a
- updating gun with bug fix · 1fcdcb12
  Alexander Strizhakov authored 5 years ago
  
  https://github.com/ninenines/gun/issues/222
  1fcdcb12
- changelog fix · 2afc7a91
  Alexander Strizhakov authored 5 years ago
  
  2afc7a91
- Merge branch 'develop' into gun · f497cf2f
  Alexander Strizhakov authored 5 years ago
  
  f497cf2f